Changeset b50b5af2 in mainline for boot/genarch/balloc.c

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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.

File:

• boot/genarch/balloc.c (modified) (2 diffs)

boot/genarch/balloc.c

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