Changeset a000878c in mainline for kernel/arch/mips32/src

Timestamp:

2010-02-25T19:11:25Z (15 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/mips32/src

Files:

• cpu/cpu.c (modified) (1 diff)
• debugger.c (modified) (2 diffs)
• exception.c (modified) (3 diffs)
• mm/tlb.c (modified) (3 diffs)

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

@@ -40 +40 @@
 
 struct data_t {
-        char *vendor;
-        char *model;
+        const char *vendor;
+        const char *model;
 };
 

kernel/arch/mips32/src/debugger.c

@@ -253 +253 @@
 {
         unsigned int i;
-        char *symbol;
         
         printf("#  Count Address    INPROG ONESHOT FUNCCALL In symbol\n");
         printf("-- ----- ---------- ------ ------- -------- ---------\n");
         
-        for (i = 0; i < BKPOINTS_MAX; i++)
+        for (i = 0; i < BKPOINTS_MAX; i++) {
                 if (breakpoints[i].address) {
-                        symbol = symtab_fmt_name_lookup(
+                        const char *symbol = symtab_fmt_name_lookup(
                             breakpoints[i].address);
-
+                        
                         printf("%-2u %-5d %#10zx %-6s %-7s %-8s %s\n", i,
                             breakpoints[i].counter, breakpoints[i].address,
@@ -270 +269 @@
                             BKPOINT_FUNCCALL) ? "true" : "false"), symbol);
                 }
+        }
+        
         return 1;
 }

kernel/arch/mips32/src/exception.c

@@ -49 +49 @@
 #include <symtab.h>
 
-static char * exctable[] = {
+static const char *exctable[] = {
         "Interrupt",
         "TLB Modified",
@@ -74 +74 @@
 static void print_regdump(istate_t *istate)
 {
-        char *pcsymbol, *rasymbol;
-
-        pcsymbol = symtab_fmt_name_lookup(istate->epc);
-        rasymbol = symtab_fmt_name_lookup(istate->ra);
-
+        const char *pcsymbol = symtab_fmt_name_lookup(istate->epc);
+        const char *rasymbol = symtab_fmt_name_lookup(istate->ra);
+        
         printf("PC: %#x(%s) RA: %#x(%s), SP(%p)\n", istate->epc, pcsymbol,
             istate->ra, rasymbol, istate->sp);
@@ -93 +91 @@
 static void reserved_instr_exception(int n, istate_t *istate)
 {
-        if (*((uint32_t *)istate->epc) == 0x7c03e83b) {
+        if (*((uint32_t *) istate->epc) == 0x7c03e83b) {
                 ASSERT(THREAD);
                 istate->epc += 4;
                 istate->v1 = istate->k1;
-        } else 
+        } else
                 unhandled_exception(n, istate);
 }

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

@@ -321 +321 @@
 void tlb_refill_fail(istate_t *istate)
 {
-        char *symbol, *sym2;
-
-        symbol = symtab_fmt_name_lookup(istate->epc);
-        sym2 = symtab_fmt_name_lookup(istate->ra);
+        const char *symbol = symtab_fmt_name_lookup(istate->epc);
+        const char *sym2 = symtab_fmt_name_lookup(istate->ra);
         
         fault_if_from_uspace(istate, "TLB Refill Exception on %p.",
@@ -335 +333 @@
 void tlb_invalid_fail(istate_t *istate)
 {
-        char *symbol;
-
-        symbol = symtab_fmt_name_lookup(istate->epc);
-
+        const char *symbol = symtab_fmt_name_lookup(istate->epc);
+        
         fault_if_from_uspace(istate, "TLB Invalid Exception on %p.",
             cp0_badvaddr_read());
@@ -347 +343 @@
 void tlb_modified_fail(istate_t *istate)
 {
-        char *symbol;
-
-        symbol = symtab_fmt_name_lookup(istate->epc);
-
+        const char *symbol = symtab_fmt_name_lookup(istate->epc);
+        
         fault_if_from_uspace(istate, "TLB Modified Exception on %p.",
             cp0_badvaddr_read());