Changeset 02a99d2 in mainline for src/mm

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/mm

Files:

• frame.c (modified) (4 diffs)
• heap.c (modified) (1 diff)
• vm.c (modified) (2 diffs)

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