Changeset ad12b5ea in mainline

Timestamp:

2011-11-20T16:53:04Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2686705

Parents:

a55ddc64

Message:

Factor out the amd64/ia32 code which calculates the bounds of
a zone after considering the low/hich memory split to a new
generic function frame_adjust_zone_bounds().

Location:

kernel

Files:

• arch/ia32/src/mm/frame.c (modified) (2 diffs)
• generic/include/mm/frame.h (modified) (1 diff)
• generic/src/mm/frame.c (modified) (1 diff)

kernel/arch/ia32/src/mm/frame.c

@@ -57 +57 @@
         
         for (i = 0; i < e820counter; i++) {
-                uint64_t base = e820table[i].base_address;
-                uint64_t size = e820table[i].size;
-                uintptr_t limit = config.identity_size;
+                uintptr_t base = (uintptr_t) e820table[i].base_address;
+                size_t size = (size_t) e820table[i].size;
                 
-                if (low) {
-                        if (base > limit)
-                                continue;
-                        if (base + size > limit)
-                                size = limit - base;
-                } else {
-                        if (base + size <= limit)
-                                continue;
-                        if (base <= limit) {
-                                size -= limit - base;
-                                base = limit;
-                        }
-                }
+                if (!frame_adjust_zone_bounds(low, &base, &size))
+                        continue;
                 
                 if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
@@ -93 +81 @@
                                     ZONE_AVAILABLE | ZONE_LOWMEM);
                         } else {
-                                printf("count=%lld\n", (long long int) count);
                                 conf = zone_external_conf_alloc(count);
                                 zone_create(pfn, count, conf,

kernel/generic/include/mm/frame.h

@@ -159 +159 @@
 
 extern void frame_init(void);
+extern bool frame_adjust_zone_bounds(bool, uintptr_t *, size_t *);
 extern void *frame_alloc_generic(uint8_t, frame_flags_t, size_t *);
 extern void *frame_alloc(uint8_t, frame_flags_t);

kernel/generic/src/mm/frame.c

@@ -1264 +1264 @@
 }
 
+/** Adjust bounds of physical memory region according to low/high memory split.
+ *
+ * @param low[in]       If true, the adujstment is performed to make the region
+ *                      fit in the low memory. Otherwise the adjustment is
+ *                      performed to make the region fit in the high memory.
+ * @param basep[inout]  Pointer to a variable which contains the region's base
+ *                      address and which may receive the adjusted base address.
+ * @param sizep[inout]  Pointer to a variable which contains the region's size
+ *                      and which may receive the adjusted size.
+ * @retun               True if the region still exists even after the
+ *                      adjustment, false otherwise.
+ */
+bool frame_adjust_zone_bounds(bool low, uintptr_t *basep, size_t *sizep)
+{
+        uintptr_t limit = config.identity_size;
+
+        if (low) {
+                if (*basep > limit)
+                        return false;
+                if (*basep + *sizep > limit)
+                        *sizep = limit - *basep;
+        } else {
+                if (*basep + *sizep <= limit)
+                        return false;
+                if (*basep <= limit) {
+                        *sizep -= limit - *basep;
+                        *basep = limit;
+                }
+        }
+        return true;
+}
+
 /** Return total size of all zones.
  *