Changeset a000878c in mainline for kernel/arch


Ignore:
Timestamp:
2010-02-25T19:11:25Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
958de16
Parents:
a634485
Message:

make sure that all statically allocated strings are declared as "const char *"
and are treated as read-only

Location:
kernel/arch
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/abs32le/src/abs32le.c

    ra634485 ra000878c  
    114114}
    115115
    116 void panic_printf(char *fmt, ...)
     116void panic_printf(const char *fmt, ...)
    117117{
    118118        va_list args;

  • kernel/arch/amd64/src/cpu/cpu.c

    ra634485 ra000878c  
    6262};
    6363
    64 static char *vendor_str[] = {
     64static const char *vendor_str[] = {
    6565        "Unknown Vendor",
    6666        "AuthenticAMD",

  • kernel/arch/amd64/src/debugger.c

    ra634485 ra000878c  
    339339{
    340340        unsigned int i;
    341         char *symbol;
    342341
    343342#ifdef __32_BITS__
    … …  
    353352        for (i = 0; i < BKPOINTS_MAX; i++)
    354353                if (breakpoints[i].address) {
    355                         symbol = symtab_fmt_name_lookup(
     354                        const char *symbol = symtab_fmt_name_lookup(
    356355                            breakpoints[i].address);
    357356

  • kernel/arch/amd64/src/interrupt.c

    ra634485 ra000878c  
    6565void decode_istate(int n, istate_t *istate)
    6666{
    67         char *symbol;
    68 
    69         symbol = symtab_fmt_name_lookup(istate->rip);
    70 
     67        const char *symbol = symtab_fmt_name_lookup(istate->rip);
     68       
    7169        printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);
    7270        printf("%%rip: %#llx (%s)\n", istate->rip, symbol);

  • kernel/arch/arm32/src/cpu/cpu.c

    ra634485 ra000878c  
    4343
    4444/** Implementators (vendor) names */
    45 static char *imp_data[] = {
     45static const char *imp_data[] = {
    4646        "?",                                    /* IMP_DATA_START_OFFSET */
    4747        "ARM Ltd",                              /* 0x41 */
    … …  
    6060
    6161/** Architecture names */
    62 static char *arch_data[] = {
     62static const char *arch_data[] = {
    6363        "?",       /* 0x0 */
    6464        "4",       /* 0x1 */
    … …  
    108108void cpu_print_report(cpu_t *m)
    109109{
    110         char * vendor = imp_data[0];
    111         char * architecture = arch_data[0];
     110        const char *vendor = imp_data[0];
     111        const char *architecture = arch_data[0];
    112112        cpu_arch_t * cpu_arch = &m->arch;
    113113

  • kernel/arch/ia32/src/cpu/cpu.c

    ra634485 ra000878c  
    6464};
    6565
    66 static char *vendor_str[] = {
     66static const char *vendor_str[] = {
    6767        "Unknown Vendor",
    6868        "AMD",

  • kernel/arch/ia32/src/interrupt.c

    ra634485 ra000878c  
    6565void decode_istate(istate_t *istate)
    6666{
    67         char *symbol;
    68 
    69         symbol = symtab_fmt_name_lookup(istate->eip);
    70 
     67        const char *symbol = symtab_fmt_name_lookup(istate->eip);
     68       
    7169        if (CPU)
    7270                printf("----------------EXCEPTION OCCURED (cpu%u)----------------\n", CPU->id);
    7371        else
    7472                printf("----------------EXCEPTION OCCURED----------------\n");
    75                
     73       
    7674        printf("%%eip: %#lx (%s)\n", istate->eip, symbol);
    7775        printf("ERROR_WORD=%#lx\n", istate->error_word);
    … …  
    8078        printf("stack: %#lx, %#lx, %#lx, %#lx\n", istate->stack[0], istate->stack[1], istate->stack[2], istate->stack[3]);
    8179        printf("       %#lx, %#lx, %#lx, %#lx\n", istate->stack[4], istate->stack[5], istate->stack[6], istate->stack[7]);
    82 
     80       
    8381        stack_trace_istate(istate);
    8482}

  • kernel/arch/ia32/src/mm/frame.c

    ra634485 ra000878c  
    2727 */
    2828
    29 /** @addtogroup ia32mm 
     29/** @addtogroup ia32mm
    3030 * @{
    3131 */
    … …  
    109109}
    110110
    111 static char *e820names[] = {
     111static const char *e820names[] = {
    112112        "invalid",
    113113        "available",
    … …  
    122122{
    123123        unsigned int i;
    124         char *name;
     124        const char *name;
    125125       
    126126        printf("Base               Size               Name\n");

  • kernel/arch/ia64/src/cpu/cpu.c

    ra634485 ra000878c  
    5252void cpu_print_report(cpu_t *m)
    5353{
    54         char *family_str;
     54        const char *family_str;
    5555        char vendor[2 * sizeof(uint64_t) + 1];
    5656       

  • kernel/arch/ia64/src/interrupt.c

    ra634485 ra000878c  
    6464#define BUNDLE_SIZE             16
    6565
    66 char *vector_names_64_bundle[VECTORS_64_BUNDLE] = {
     66static const char *vector_names_64_bundle[VECTORS_64_BUNDLE] = {
    6767        "VHPT Translation vector",
    6868        "Instruction TLB vector",
    … …  
    8787};
    8888
    89 char *vector_names_16_bundle[VECTORS_16_BUNDLE] = {
     89static const char *vector_names_16_bundle[VECTORS_16_BUNDLE] = {
    9090        "Page Not Present vector",
    9191        "Key Permission vector",
    … …  
    121121};
    122122
    123 static char *vector_to_string(uint16_t vector);
    124 static void dump_interrupted_context(istate_t *istate);
    125 
    126 char *vector_to_string(uint16_t vector)
     123static const char *vector_to_string(uint16_t vector)
    127124{
    128125        ASSERT(vector <= VECTOR_MAX);
    … …  
    135132}
    136133
    137 void dump_interrupted_context(istate_t *istate)
    138 {
    139         char *ifa, *iipa, *iip;
    140 
    141         ifa = symtab_fmt_name_lookup(istate->cr_ifa);
    142         iipa = symtab_fmt_name_lookup(istate->cr_iipa);
    143         iip = symtab_fmt_name_lookup(istate->cr_iip);
    144 
     134static void dump_interrupted_context(istate_t *istate)
     135{
     136        const char *ifa = symtab_fmt_name_lookup(istate->cr_ifa);
     137        const char *iipa = symtab_fmt_name_lookup(istate->cr_iipa);
     138        const char *iip = symtab_fmt_name_lookup(istate->cr_iip);
     139       
    145140        putchar('\n');
    146141        printf("Interrupted context dump:\n");
    … …  
    162157void general_exception(uint64_t vector, istate_t *istate)
    163158{
    164         char *desc = "";
    165 
     159        const char *desc;
     160       
    166161        switch (istate->cr_isr.ge_code) {
    167162        case GE_ILLEGALOP:
    … …  
    187182                break;
    188183        }
    189 
     184       
    190185        fault_if_from_uspace(istate, "General Exception (%s).", desc);
    191 
     186       
    192187        dump_interrupted_context(istate);
    193188        panic("General Exception (%s).", desc);

  • kernel/arch/mips32/src/cpu/cpu.c

    ra634485 ra000878c  
    4040
    4141struct data_t {
    42         char *vendor;
    43         char *model;
     42        const char *vendor;
     43        const char *model;
    4444};
    4545

  • kernel/arch/mips32/src/debugger.c

    ra634485 ra000878c  
    253253{
    254254        unsigned int i;
    255         char *symbol;
    256255       
    257256        printf("#  Count Address    INPROG ONESHOT FUNCCALL In symbol\n");
    258257        printf("-- ----- ---------- ------ ------- -------- ---------\n");
    259258       
    260         for (i = 0; i < BKPOINTS_MAX; i++)
     259        for (i = 0; i < BKPOINTS_MAX; i++) {
    261260                if (breakpoints[i].address) {
    262                         symbol = symtab_fmt_name_lookup(
     261                        const char *symbol = symtab_fmt_name_lookup(
    263262                            breakpoints[i].address);
    264 
     263                       
    265264                        printf("%-2u %-5d %#10zx %-6s %-7s %-8s %s\n", i,
    266265                            breakpoints[i].counter, breakpoints[i].address,
    … …  
    270269                            BKPOINT_FUNCCALL) ? "true" : "false"), symbol);
    271270                }
     271        }
     272       
    272273        return 1;
    273274}

  • kernel/arch/mips32/src/exception.c

    ra634485 ra000878c  
    4949#include <symtab.h>
    5050
    51 static char * exctable[] = {
     51static const char *exctable[] = {
    5252        "Interrupt",
    5353        "TLB Modified",
    … …  
    7474static void print_regdump(istate_t *istate)
    7575{
    76         char *pcsymbol, *rasymbol;
    77 
    78         pcsymbol = symtab_fmt_name_lookup(istate->epc);
    79         rasymbol = symtab_fmt_name_lookup(istate->ra);
    80 
     76        const char *pcsymbol = symtab_fmt_name_lookup(istate->epc);
     77        const char *rasymbol = symtab_fmt_name_lookup(istate->ra);
     78       
    8179        printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol,
    8280            istate->ra, rasymbol, istate->sp);
    … …  
    9391static void reserved_instr_exception(int n, istate_t *istate)
    9492{
    95         if (*((uint32_t *)istate->epc) == 0x7c03e83b) {
     93        if (*((uint32_t *) istate->epc) == 0x7c03e83b) {
    9694                ASSERT(THREAD);
    9795                istate->epc += 4;
    9896                istate->v1 = istate->k1;
    99         } else 
     97        } else
    10098                unhandled_exception(n, istate);
    10199}

  • kernel/arch/mips32/src/mm/tlb.c

    ra634485 ra000878c  
    321321void tlb_refill_fail(istate_t *istate)
    322322{
    323         char *symbol, *sym2;
    324 
    325         symbol = symtab_fmt_name_lookup(istate->epc);
    326         sym2 = symtab_fmt_name_lookup(istate->ra);
     323        const char *symbol = symtab_fmt_name_lookup(istate->epc);
     324        const char *sym2 = symtab_fmt_name_lookup(istate->ra);
    327325       
    328326        fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
    … …  
    335333void tlb_invalid_fail(istate_t *istate)
    336334{
    337         char *symbol;
    338 
    339         symbol = symtab_fmt_name_lookup(istate->epc);
    340 
     335        const char *symbol = symtab_fmt_name_lookup(istate->epc);
     336       
    341337        fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
    342338            cp0_badvaddr_read());
    … …  
    347343void tlb_modified_fail(istate_t *istate)
    348344{
    349         char *symbol;
    350 
    351         symbol = symtab_fmt_name_lookup(istate->epc);
    352 
     345        const char *symbol = symtab_fmt_name_lookup(istate->epc);
     346       
    353347        fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
    354348            cp0_badvaddr_read());

  • kernel/arch/ppc32/src/cpu/cpu.c

    ra634485 ra000878c  
    5454void cpu_print_report(cpu_t *m)
    5555{
    56         char *name;
     56        const char *name;
    5757       
    5858        switch (m->arch.version) {

  • kernel/arch/ppc32/src/mm/tlb.c

    ra634485 ra000878c  
    114114static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
    115115{
    116         char *symbol;
    117         char *sym2;
    118 
    119         symbol = symtab_fmt_name_lookup(istate->pc);
    120         sym2 = symtab_fmt_name_lookup(istate->lr);
    121 
     116        const char *symbol = symtab_fmt_name_lookup(istate->pc);
     117        const char *sym2 = symtab_fmt_name_lookup(istate->lr);
     118       
    122119        fault_if_from_uspace(istate,
    123120            "PHT Refill Exception on %p.", badvaddr);

  • kernel/arch/sparc64/src/cpu/sun4u/cpu.c

    ra634485 ra000878c  
    129129void cpu_print_report(cpu_t *m)
    130130{
    131         char *manuf, *impl;
     131        const char *manuf;
     132        const char *impl;
    132133
    133134        switch (m->arch.ver.manuf) {

  • kernel/arch/sparc64/src/mm/sun4u/tlb.c

    ra634485 ra000878c  
    6464    tlb_tag_access_reg_t, const char *);
    6565
    66 char *context_encoding[] = {
     66const char *context_encoding[] = {
    6767        "Primary",
    6868        "Secondary",

  • kernel/arch/sparc64/src/mm/sun4v/tlb.c

    ra634485 ra000878c  
    8989 * field of the MMU fault status area is i.
    9090 */
    91 char *fault_types[] = {
     91static const char *fault_types[] = {
    9292        "unknown",
    9393        "fast miss",
    … …  
    107107        "invalid page size"
    108108        };
    109        
    110109
    111110/** Array of MMU fault status areas. */

  • kernel/arch/sparc64/src/trap/exception.c

    ra634485 ra000878c  
    4646void dump_istate(istate_t *istate)
    4747{
    48         char *tpcs, *tnpcs;
    49 
    50         tpcs = symtab_fmt_name_lookup(istate->tpc);
    51         tnpcs = symtab_fmt_name_lookup(istate->tnpc);
    52 
     48        const char *tpcs = symtab_fmt_name_lookup(istate->tpc);
     49        const char *tnpcs = symtab_fmt_name_lookup(istate->tnpc);
     50       
    5351        printf("TSTATE=%#" PRIx64 "\n", istate->tstate);
    5452        printf("TPC=%#" PRIx64 " (%s)\n", istate->tpc, tpcs);
Note: See TracChangeset for help on using the changeset viewer.