Changeset 4872160 in mainline for boot/generic/src/balloc.c

Timestamp:

2010-05-04T10:44:55Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

568db0f

Parents:

bb252ca

Message:

new boot infrastructure

• more code and metadata unification
• import of up-to-date implementations from the kernel
• the boot loaders should behave more similarly on all platforms
• support for deflate compressed (LZ77) boot components
  • this again allows feasible boot images to be created on mips32
• IA64 is still not booting
  • the broken forked GNU EFI library has been removed, a replacement of the functionality is on its way

File:

• boot/generic/src/balloc.c (moved) (moved from boot/genarch/balloc.c ) (3 diffs)

boot/generic/src/balloc.c

@@ -28 +28 @@
 
 #include <balloc.h>
-#include <asm.h>
-#include <types.h>
+#include <typedefs.h>
 #include <align.h>
 
 static ballocs_t *ballocs;
 static uintptr_t phys_base;
+static size_t max_size;
 
-void balloc_init(ballocs_t *ball, uintptr_t base, uintptr_t kernel_base)
+void balloc_init(ballocs_t *ball, void *base, uintptr_t kernel_base,
+    size_t size)
 {
         ballocs = ball;
-        phys_base = base;
+        phys_base = (uintptr_t) base;
+        max_size = size;
         ballocs->base = kernel_base;
         ballocs->size = 0;
@@ -45 +47 @@
 void *balloc(size_t size, size_t alignment)
 {
+        if (alignment == 0)
+                return NULL;
+        
         /* Enforce minimal alignment. */
         alignment = ALIGN_UP(alignment, 4);
@@ -50 +55 @@
         uintptr_t addr = phys_base + ALIGN_UP(ballocs->size, alignment);
         
-        if (ALIGN_UP(ballocs->size, alignment) + size > BALLOC_MAX_SIZE)
+        if (ALIGN_UP(ballocs->size, alignment) + size >= max_size)
                 return NULL;