Changeset 42744880 in mainline for generic

Timestamp:

2006-02-08T22:29:20Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

85dc2e7

Parents:

89298e3

Message:

Convert size_t, count_t and index_t to 64-bits on 64-bit architectures.
Change some pfn_t usages to count_t, size_t and index_t.

Location:

generic

Files:

• include/config.h (modified) (2 diffs)
• include/mm/frame.h (modified) (2 diffs)
• include/typedefs.h (modified) (1 diff)
• src/main/kinit.c (modified) (2 diffs)
• src/mm/frame.c (modified) (11 diffs)

generic/include/config.h

@@ -37 +37 @@
 
 #define CONFIG_MEMORY_SIZE      (8*1024*1024)
-#define CONFIG_HEAP_SIZE        (300*1024)
 #define CONFIG_STACK_SIZE       STACK_SIZE
 
@@ -50 +49 @@
         size_t init_size;
         
-        __address heap_addr;
-        size_t heap_size;
-        size_t heap_delta;            /**< Extra space between heap and stack (enforced by alignment requirements) */
-        
-        size_t kernel_size;           /**< Size of memory in bytes taken by kernel, heap and stack */
+        size_t kernel_size;           /**< Size of memory in bytes taken by kernel and stack */
 };
 

generic/include/mm/frame.h

@@ -75 +75 @@
 }
 
-static inline pfn_t SIZE2PFN(__address size)
+static inline count_t SIZE2FRAMES(size_t size)
 {
         if (!size)
                 return 0;
-        return (pfn_t)((size-1) >> FRAME_WIDTH)+1;
+        return (count_t)((size-1) >> FRAME_WIDTH)+1;
 }
 
@@ -96 +96 @@
 extern void frame_free(__address addr);
 
-extern void zone_create(pfn_t start, pfn_t count, pfn_t confframe, int flags);
+extern void zone_create(pfn_t start, count_t count, pfn_t confframe, int flags);
 
 void * frame_get_parent(pfn_t frame, int hint);
 void frame_set_parent(pfn_t frame, void *data, int hint);
-void frame_mark_unavailable(pfn_t start, pfn_t count);
-__address zone_conf_size(pfn_t start, pfn_t count);
+void frame_mark_unavailable(pfn_t start, count_t count);
+__address zone_conf_size(pfn_t start, count_t count);
 
 /*

generic/include/typedefs.h

@@ -35 +35 @@
 typedef short bool;
 
-typedef unsigned int size_t;
-typedef unsigned int count_t;
-typedef unsigned int index_t;
+typedef unsigned long size_t;
+typedef unsigned long count_t;
+typedef unsigned long index_t;
 
 typedef struct config config_t;

generic/src/main/kinit.c

@@ -73 +73 @@
         as_area_t *a;
         __address frame;
-        pfn_t frames;
+        count_t frames;
         int i;
         task_t *u;
@@ -166 +166 @@
                         frame = KA2PA(frame);
 
-                frames = SIZE2PFN(config.init_size);
+                frames = SIZE2FRAMES(config.init_size);
                 
                 a = as_area_create(as, AS_AREA_TEXT, frames, UTEXT_ADDRESS);

generic/src/mm/frame.c

@@ -62 +62 @@
         SPINLOCK_DECLARE(lock); /**< this lock protects everything below */
         pfn_t base;     /**< frame_no of the first frame in the frames array */
-        pfn_t count;          /**< Size of zone */
+        count_t count;          /**< Size of zone */
 
         frame_t *frames;        /**< array of frame_t structures in this zone */
@@ -100 +100 @@
 
 /** Compute pfn_t from frame_t pointer & zone pointer */
-static pfn_t make_frame_index(zone_t *zone, frame_t *frame)
+static index_t make_frame_index(zone_t *zone, frame_t *frame)
 {
         return frame - zone->frames;
@@ -424 +424 @@
  * Assume zone is locked
  */
-static void zone_frame_free(zone_t *zone, pfn_t frame_idx)
+static void zone_frame_free(zone_t *zone, index_t frame_idx)
 {
         frame_t *frame;
@@ -446 +446 @@
 
 /** Return frame from zone */
-static frame_t * zone_get_frame(zone_t *zone, pfn_t frame_idx)
+static frame_t * zone_get_frame(zone_t *zone, index_t frame_idx)
 {
         ASSERT(frame_idx < zone->count);
@@ -453 +453 @@
 
 /** Mark frame in zone unavailable to allocation */
-static void zone_mark_unavailable(zone_t *zone, pfn_t frame_idx)
+static void zone_mark_unavailable(zone_t *zone, index_t frame_idx)
 {
         frame_t *frame;
@@ -476 +476 @@
  * @return Initialized zone.
  */
-static zone_t * zone_construct(pfn_t start, pfn_t count, 
+static zone_t * zone_construct(pfn_t start, count_t count, 
                                zone_t *z, int flags)
 {
@@ -517 +517 @@
 
 /** Compute configuration data size for zone */
-__address zone_conf_size(pfn_t start, pfn_t count)
+__address zone_conf_size(pfn_t start, count_t count)
 {
         int size = sizeof(zone_t) + count*sizeof(frame_t);
@@ -531 +531 @@
  *
  * @param confframe Where configuration frame is supposed to be.
- *                  Always check, that we will not disturb kernel pages
- *                  the kernel and possibly init. 
+ *                  Always check, that we will not disturb the kernel and possibly init. 
  *                  If confframe is given _outside_ this zone, it is expected,
  *                  that the area is already marked BUSY and big enough
  *                  to contain zone_conf_size() amount of data
  */
-void zone_create(pfn_t start, pfn_t count, pfn_t confframe, int flags)
+void zone_create(pfn_t start, count_t count, pfn_t confframe, int flags)
 {
         zone_t *z;
         __address addr,endaddr;
-        pfn_t confcount;
+        count_t confcount;
         int i;
 
@@ -552 +551 @@
          * it does not span kernel & init
          */
-        confcount = SIZE2PFN(zone_conf_size(start,count));
+        confcount = SIZE2FRAMES(zone_conf_size(start,count));
         if (confframe >= start && confframe < start+count) {
                 for (;confframe < start+count;confframe++) {
@@ -700 +699 @@
 
 /** Mark given range unavailable in frame zones */
-void frame_mark_unavailable(pfn_t start, pfn_t count)
+void frame_mark_unavailable(pfn_t start, count_t count)
 {
         int i;
@@ -730 +729 @@
         if (config.cpu_active == 1) {
                 frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)),
-                                       SIZE2PFN(config.kernel_size));
+                                       SIZE2FRAMES(config.kernel_size));
                 if (config.init_size > 0)
                         frame_mark_unavailable(ADDR2PFN(KA2PA(config.init_addr)),
-                                               SIZE2PFN(config.init_size));
+                                               SIZE2FRAMES(config.init_size));
         }
 }