Changeset 04803bf in mainline for boot/generic/src/balloc.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• boot/generic/src/balloc.c (moved) (moved from boot/genarch/balloc.c ) (4 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;
         
@@ -60 +65 @@
 void *balloc_rebase(void *ptr)
 {
-        return (void *) ((uintptr_t) ptr - phys_base + ballocs->base);
+        return (void *) (((uintptr_t) ptr - phys_base) + ballocs->base);
 }