Changeset 02a99d2 in mainline for 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:

src

Files:

• debug/print.c (modified) (2 diffs)
• main/kinit.c (modified) (3 diffs)
• main/main.c (modified) (1 diff)
• mm/frame.c (modified) (4 diffs)
• mm/heap.c (modified) (1 diff)
• mm/vm.c (modified) (2 diffs)
• proc/scheduler.c (modified) (1 diff)
• synch/rwlock.c (modified) (1 diff)
• time/timeout.c (modified) (1 diff)

src/debug/print.c

@@ -47 +47 @@
 void print_str(const char *str)
 {
-        int i = 0;
+        int i = 0;
         char c;
-    
+        
         while (c = str[i++])
-            putchar(c);
+                putchar(c);
 }
 
@@ -85 +85 @@
  *
  */
-void print_number(const __native num, const int base)
+void print_number(const __native num, const unsigned int base)
 {
         int val = num;
         char d[sizeof(__native)*8+1];           /* this is good enough even for base == 2 */
-        int i = sizeof(__native)*8-1;
-    
+        int i = sizeof(__native)*8-1;
+        
         do {
                 d[i--] = digits[val % base];

src/main/kinit.c

@@ -120 +120 @@
          */
         m = vm_create();
-        if (!m) panic(PANIC "vm_create");
+        if (!m) panic("vm_create");
         u = task_create(m);
-        if (!u) panic(PANIC "task_create");
+        if (!u) panic("task_create");
         t = thread_create(uinit, NULL, u, THREAD_USER_STACK);
-        if (!t) panic(PANIC "thread_create");
+        if (!t) panic("thread_create");
 
         /*
@@ -130 +130 @@
          */     
         a = vm_area_create(m, VMA_TEXT, 1, UTEXT_ADDRESS);
-        if (!a) panic(PANIC "vm_area_create: vm_text");
+        if (!a) panic("vm_area_create: vm_text");
         memcopy((__address) utext, PA2KA(a->mapping[0]), utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);              
 
@@ -137 +137 @@
          */
         a = vm_area_create(m, VMA_STACK, 1, USTACK_ADDRESS);
-        if (!a) panic(PANIC "vm_area_create: vm_stack");
+        if (!a) panic("vm_area_create: vm_stack");
         
         thread_ready(t);

src/main/main.c

@@ -30 +30 @@
 #include <arch/context.h>
 #include <print.h>
+#include <panic.h>
 #include <config.h>
 #include <time/clock.h>

src/mm/frame.c

@@ -72 +72 @@
                 frame_bitmap = (__u8 *) malloc(frame_bitmap_octets);
                 if (!frame_bitmap)
-                        panic(PANIC "malloc/frame_bitmap\n");
+                        panic("malloc/frame_bitmap\n");
 
                 /*
@@ -145 +145 @@
                         }
                 }
-                panic(PANIC "frames_free inconsistent (%d)\n", frames_free);
+                panic("frames_free inconsistent (%d)\n", frames_free);
         }
         spinlock_unlock(&framelock);
@@ -151 +151 @@
 
         if (flags & FRAME_PANIC)
-                panic(PANIC "unable to allocate frame\n");
+                panic("unable to allocate frame\n");
                 
         /* TODO: implement sleeping logic here */
-        panic(PANIC "sleep not supported\n");
+        panic("sleep not supported\n");
         
         goto loop;
@@ -196 +196 @@
                         }       
                 }
-                else panic(PANIC "frame_free: frame already free\n");
-        }
-        else panic(PANIC "frame_free: frame number too big\n");
+                else panic("frame_free: frame already free\n");
+        }
+        else panic("frame_free: frame number too big\n");
         
         spinlock_unlock(&framelock);

src/mm/heap.c

@@ -31 +31 @@
 #include <func.h>
 #include <memstr.h>
+#include <panic.h>
 #include <arch/types.h>
 

src/mm/vm.c

@@ -63 +63 @@
         
         if (addr % PAGE_SIZE)
-                panic(PANIC "addr not aligned to a page boundary");
+                panic("addr not aligned to a page boundary");
         
         pri = cpu_priority_high();
@@ -125 +125 @@
                         break;
                 default:
-                        panic(PANIC "unexpected vm_type_t %d", a->type); 
+                        panic("unexpected vm_type_t %d", a->type); 
         }
         

src/proc/scheduler.c

@@ -38 +38 @@
 #include <arch/asm.h>
 #include <list.h>
+#include <panic.h>
 #include <typedefs.h>
 #include <mm/page.h>

src/synch/rwlock.c

@@ -185 +185 @@
                                 break;
                         case ESYNCH_OK_ATOMIC:
-                                panic(PANIC "_mutex_lock_timeout()==ESYNCH_OK_ATOMIC");
+                                panic("_mutex_lock_timeout()==ESYNCH_OK_ATOMIC");
                                 break;
                         dafault:
-                                panic(PANIC "invalid ESYNCH");
+                                panic("invalid ESYNCH");
                                 break;
                 }

src/time/timeout.c

@@ -31 +31 @@
 #include <arch/types.h>
 #include <config.h>
+#include <panic.h>
 #include <synch/spinlock.h>
 #include <func.h>