Changeset 02a99d2 in mainline for arch/ia32/src

Timestamp:

2005-05-11T19:51:55Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

69515260

Parents:

45671f48

Message:

NDEBUG debug symbol, ASSERT debug macro, fancier panic() in debug mode
indentation fixes, ASSERTs

Location:

arch/ia32/src

Files:

• debug/panic.s (modified) (1 diff)
• interrupt.c (modified) (6 diffs)
• pm.c (modified) (1 diff)
• smp/mps.c (modified) (1 diff)

arch/ia32/src/debug/panic.s

@@ -28 +28 @@
 
 .text
-.global panic
+.global panic_printf
 
-panic:
+panic_printf:
         movl $halt,(%esp)       # fake stack to make printf return to halt
         jmp printf

arch/ia32/src/interrupt.c

@@ -29 +29 @@
 #include <arch/interrupt.h>
 #include <print.h>
+#include <debug.h>
 #include <panic.h>
 #include <arch/i8259.h>
@@ -49 +50 @@
 iroutine trap_register(__u8 n, iroutine f)
 {
+        ASSERT(n < IVT_ITEMS);
+        
         iroutine old;
-    
+        
         old = ivt[n];
         ivt[n] = f;
-    
-        return old;
+        
+        return old;
 }
 
@@ -63 +66 @@
 void trap_dispatcher(__u8 n, __u32 stack[])
 {
-        ivt[n](n,stack);
+        ASSERT(n < IVT_ITEMS);
+        
+        ivt[n](n, stack);
 }
 
@@ -113 +118 @@
                 enable_irqs_function(irqmask);
         else
-                panic(PANIC "no enable_irqs_function\n");
+                panic("no enable_irqs_function\n");
 }
 
@@ -121 +126 @@
                 disable_irqs_function(irqmask);
         else
-                panic(PANIC "no disable_irqs_function\n");
+                panic("no disable_irqs_function\n");
 }
 
@@ -129 +134 @@
                 eoi_function();
         else
-                panic(PANIC "no eoi_function\n");
+                panic("no eoi_function\n");
 
 }

arch/ia32/src/pm.c

@@ -144 +144 @@
                 tss_p = (struct tss *) malloc(sizeof(struct tss));
                 if (!tss_p)
-                        panic(PANIC "could not allocate TSS\n");
+                        panic("could not allocate TSS\n");
         }
 

arch/ia32/src/smp/mps.c

@@ -470 +470 @@
                  */
                 if (!(gdt_new = (struct descriptor *) malloc(GDT_ITEMS*sizeof(struct descriptor))))
-                        panic(PANIC "couldn't allocate memory for GDT\n");
+                        panic("couldn't allocate memory for GDT\n");
 
                 memcopy(gdt, gdt_new, GDT_ITEMS*sizeof(struct descriptor));