Changeset 2b50d7c in mainline for src/mm/frame.c

Timestamp:

2005-05-28T20:13:25Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

747a2476

Parents:

87cb9e2

Message:

IA-64 work.
Redefine FRAME_SIZE to "(16*1024)" instead of "2*4096". Note that the latter definition was wrong because of the lack of "()".
Take panic_printf(), cpu_halt() and memsetb() out of fake.s and implement them properly in asm.S.
Move ski_init_console() from arch_post_mm_init() to arch_pre_mm_init().
In start.S, write r0 to ar.bspstore.

Janitorial fixes.
Add count_t type.
Replace several occurrences of int and u32 by count_t or size_t.
Shorten several panic strings.

File:

• src/mm/frame.c (modified) (7 diffs)

src/mm/frame.c

@@ -43 +43 @@
 #include <synch/spinlock.h>
 
-__u32 frames;
-__u32 frames_free;
+count_t frames = 0;
+count_t frames_free;
 
 __u8 *frame_bitmap;
-__u32 frame_bitmap_octets;
+count_t frame_bitmap_octets;
 
 /*
@@ -54 +54 @@
  */
 __u8 *frame_kernel_bitmap;
-__u32 kernel_frames;
-__u32 kernel_frames_free;
+count_t kernel_frames;
+count_t kernel_frames_free;
 
 static spinlock_t framelock;
@@ -69 +69 @@
                 frames = config.memory_size / FRAME_SIZE;
                 frame_bitmap_octets = frames / 8 + (frames % 8 > 0);
-
                 frame_bitmap = (__u8 *) malloc(frame_bitmap_octets);
                 if (!frame_bitmap)
@@ -111 +110 @@
         pri_t pri;
         __u8 **frame_bitmap_ptr = &frame_bitmap;
-        __u32 *frames_ptr = &frames, *frames_free_ptr = &frames_free;
+        count_t *frames_ptr = &frames, *frames_free_ptr = &frames_free;
         
         if (flags & FRAME_KA) {
@@ -166 +165 @@
         pri_t pri;
         __u32 frame;
-        __u32 *frames_free_ptr = &frames_free, *frames_ptr = &frames;
+        count_t *frames_free_ptr = &frames_free, *frames_ptr = &frames;
         __u8 **frame_bitmap_ptr = &frame_bitmap;
 
@@ -196 +195 @@
                         }       
                 }
-                else panic("frame_free: frame already free\n");
-        }
-        else panic("frame_free: frame number too big\n");
+                else panic("frame already free\n");
+        }
+        else panic("frame number too big\n");
         
         spinlock_unlock(&framelock);
@@ -212 +211 @@
         pri_t pri;
         __u32 frame;
-        __u32 *frames_ptr = &frames, *frames_free_ptr = &frames_free;
+        count_t *frames_ptr = &frames, *frames_free_ptr = &frames_free;
         __u8 **frame_bitmap_ptr = &frame_bitmap;