Changeset 371bd7d in mainline for kernel/arch/mips32/src

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/mips32/src

Files:

• cpu/cpu.c (modified) (1 diff)
• ddi/ddi.c (modified) (1 diff)
• debug/stacktrace.c (added)
• debug/stacktrace_asm.S (added)
• debugger.c (modified) (2 diffs)
• exception.c (modified) (4 diffs)
• interrupt.c (modified) (1 diff)
• mips32.c (modified) (3 diffs)
• mm/tlb.c (modified) (3 diffs)
• smp/dorder.c (modified) (2 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/ddi/ddi.c

@@ -35 +35 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <security/cap.h>
 #include <arch.h>

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

@@ -38 +38 @@
 #include <panic.h>
 #include <arch/cp0.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <debug.h>
@@ -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/interrupt.c

@@ -35 +35 @@
 #include <interrupt.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <arch/cp0.h>

kernel/arch/mips32/src/mips32.c

@@ -46 +46 @@
 #include <sysinfo/sysinfo.h>
 #include <arch/interrupt.h>
+#include <interrupt.h>
 #include <console/chardev.h>
 #include <arch/barrier.h>
@@ -56 +57 @@
 #include <macros.h>
 #include <config.h>
-#include <string.h>
+#include <str.h>
 #include <arch/drivers/msim.h>
 #include <arch/asm/regname.h>
@@ -257 +258 @@
 }
 
+void irq_initialize_arch(irq_t *irq)
+{
+        (void) irq;
+}
+
 /** @}
  */

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());

kernel/arch/mips32/src/smp/dorder.c

@@ -33 +33 @@
  */
 
-#include <arch/smp/dorder.h>
+#include <smp/ipi.h>
+
+#ifdef CONFIG_SMP
 
 #define MSIM_DORDER_ADDRESS  0xB0000004
@@ -39 +41 @@
 void ipi_broadcast_arch(int ipi)
 {
-#ifdef CONFIG_SMP
         *((volatile unsigned int *) MSIM_DORDER_ADDRESS) = 0x7FFFFFFF;
+}
+
 #endif
-}
 
 /** @}