Changeset adecf496 in mainline for src

Timestamp:

2005-09-23T22:54:45Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

48a02ef

Parents:

4841104

Message:

Revert previous change in frame_t as it broke IA-64.
(Most likely some alignment problem.)

Rename heap_init(), malloc() and free(), respectively, to early_heap_init(), early_malloc() and early_free(), respectively.
Define new macros malloc() and free(). They are to be replaced by real functions some day.

Location:

src

Files:

• main/main.c (modified) (1 diff)
• mm/frame.c (modified) (2 diffs)
• mm/heap.c (modified) (3 diffs)

src/main/main.c

@@ -148 +148 @@
         
         arch_pre_mm_init();
-        heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, heap_size + heap_delta);
+        early_heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, heap_size + heap_delta);
         frame_init();
         page_init();

src/mm/frame.c

@@ -299 +299 @@
         cnt = size / FRAME_SIZE;
         
-        z = (zone_t *) malloc(sizeof(zone_t));
+        z = (zone_t *) early_malloc(sizeof(zone_t));
         if (z) {
                 link_initialize(&z->link);
@@ -312 +312 @@
                 z->busy_count = 0;
                 
-                z->frames = (frame_t *) malloc(cnt * sizeof(frame_t));
+                z->frames = (frame_t *) early_malloc(cnt * sizeof(frame_t));
                 if (!z->frames) {
                         free(z);

src/mm/heap.c

@@ -45 +45 @@
 static spinlock_t heaplock;
 
-void heap_init(__address heap, size_t size)
+void early_heap_init(__address heap, size_t size)
 {
         spinlock_initialize(&heaplock);
@@ -59 +59 @@
  * Uses first-fit algorithm.
  */
-void *malloc(size_t size)
+void *early_malloc(size_t size)
 {
         pri_t pri;
@@ -115 +115 @@
 }
 
-void free(void *ptr)
+void early_free(void *ptr)
 {
         pri_t pri;