Cleaner interface for kernel memory allocator.

* Split <libkern.h> into <memory.h> and <debug.h> * Rename klog into Log.
cahirwpz · Apr 13, 2021 · 33ca073 · 33ca073
1 parent b8f4e46
commit 33ca073
Show file tree

Hide file tree

Showing 30 changed files with 111 additions and 131 deletions.
diff --git a/FreeRTOSConfig.h b/FreeRTOSConfig.h
@@ -84,10 +84,4 @@ void vPortTrapHandler(struct TrapFrame *);
 void vPortDefineMemoryRegions(struct MemRegion *);
 void vPortSetupExceptionVector(struct BootData *);
 
-/* Allocate chip memory, should be freed with vPortFree. */
-void *pvPortMallocChip(size_t size);
-
-/* Check consistency of heap allocator structures. */
-void vPortMemCheck(int verbose);
-
 #endif /* FREERTOS_CONFIG_H */
diff --git a/drivers/bitmap.c b/drivers/bitmap.c
@@ -1,8 +1,7 @@
 #include <bitmap.h>
 #include <copper.h>
-#include <cpu.h>
 #include <string.h>
-#include <libkern.h>
+#include <memory.h>
 
 void CopSetupScreen(CopList_t *list, const Bitmap_t *bm, uint16_t mode,
                     uint16_t xs, uint16_t ys) {
@@ -32,7 +31,7 @@ void BitmapInit(Bitmap_t *bm, uint16_t width, uint16_t height, uint16_t depth,
   uint16_t bytesPerRow = ((width + 15) & ~15) / 8;
   int bplSize = muls16(bytesPerRow, height);
   long size = muls16(bplSize, depth);
-  void *planes = kmalloc_chip(size);
+  void *planes = MemAlloc(size, MF_CHIP);
   memset(planes, 0, size);
 
   bm->width = width;

diff --git a/drivers/console.c b/drivers/console.c
@@ -11,7 +11,7 @@
 #include <driver.h>
 #include <devfile.h>
 #include <ioreq.h>
-#include <libkern.h>
+#include <memory.h>
 #include <string.h>
 #include <sys/errno.h>
 
@@ -102,8 +102,8 @@ int ConsoleAttach(Driver_t *drv) {
   BitmapInit(&cons->bm, WIDTH, HEIGHT + FONT_H, DEPTH, 0);
 
   cons->rowsize = muls16(FONT_H, cons->bm.bytesPerRow);
-  cons->rowptr = kmalloc(sizeof(void *) * (NROW + 1));
-  cons->rowins = kmalloc(sizeof(CopIns_t *) * NROW);
+  cons->rowptr = MemAlloc(sizeof(void *) * (NROW + 1), 0);
+  cons->rowins = MemAlloc(sizeof(CopIns_t *) * NROW, 0);
 
   for (short i = 0; i < NROW + 1; i++)
     cons->rowptr[i] = cons->bm.planes[0] + muls16(i, cons->rowsize);

diff --git a/drivers/copper.c b/drivers/copper.c
@@ -1,13 +1,12 @@
-#include <cpu.h>
 #include <copper.h>
-#include <libkern.h>
+#include <memory.h>
 
 void CopListInit(CopList_t *list, uint16_t length) {
-  list->curr = list->list = kmalloc_chip(muls16(length, sizeof(CopIns_t)));
+  list->curr = list->list = MemAlloc(muls16(length, sizeof(CopIns_t)), MF_CHIP);
 }
 
 void CopListKill(CopList_t *list) {
-  kfree(list->list);
+  MemFree(list->list);
 }
 
 void CopListActivate(CopList_t *list) {

diff --git a/drivers/driver.c b/drivers/driver.c
@@ -1,24 +1,25 @@
 #include <driver.h>
-#include <libkern.h>
+#include <debug.h>
+#include <memory.h>
 #include <sys/errno.h>
 
 int DeviceAttach(Driver_t *drv) {
-  drv->state = kcalloc(1, drv->size);
+  drv->state = MemAlloc(drv->size, MF_ZERO);
   if (!drv->state)
     return ENOMEM;
-  klog("Attaching '%s' driver.\n", drv->name);
+  Log("Attaching '%s' driver.\n", drv->name);
   int error = drv->attach(drv);
   if (!error)
     return 0;
-  kfree(drv->state);
+  MemFree(drv->state);
   return error;
 }
 
 int DeviceDetach(Driver_t *drv) {
-  klog("Detaching '%s' driver.\n", drv->name);
+  Log("Detaching '%s' driver.\n", drv->name);
   int error = drv->detach(drv);
   if (error)
     return error;
-  kfree(drv->state);
+  MemFree(drv->state);
   return 0;
 }
diff --git a/drivers/floppy.c b/drivers/floppy.c
@@ -7,11 +7,11 @@
 
 #include <driver.h>
 #include <string.h>
-#include <libkern.h>
 #include <devfile.h>
 #include <msgport.h>
 #include <notify.h>
 #include <ioreq.h>
+#include <memory.h>
 #include <sys/errno.h>
 
 #define __FLOPPY_DRIVER
@@ -70,7 +70,7 @@ static int FloppyAttach(Driver_t *drv) {
   DASSERT(flp->ioTask != NULL);
 
   flp->ioPort = MsgPortCreate(flp->ioTask);
-  flp->diskTrack = pvPortMallocChip(DISK_TRACK_SIZE);
+  flp->diskTrack = MemAlloc(DISK_TRACK_SIZE, MF_CHIP);
   flp->track = -1;
   DASSERT(flp->diskTrack != NULL);
 

diff --git a/drivers/keyboard.c b/drivers/keyboard.c
@@ -6,7 +6,6 @@
 #include <ioreq.h>
 #include <driver.h>
 #include <keysym.h>
-#include <libkern.h>
 #include <sys/errno.h>
 
 #define DEBUG 0

diff --git a/drivers/mouse.c b/drivers/mouse.c
@@ -7,7 +7,6 @@
 #include <ioreq.h>
 #include <driver.h>
 #include <strings.h>
-#include <libkern.h>
 #include <sys/errno.h>
 
 #define DEBUG 0

diff --git a/drivers/serial.c b/drivers/serial.c
@@ -3,7 +3,6 @@
 
 #include <custom.h>
 #include <interrupt.h>
-#include <libkern.h>
 #include <driver.h>
 #include <ring.h>
 #include <event.h>

diff --git a/drivers/tty.c b/drivers/tty.c
@@ -8,7 +8,7 @@
 #include <event.h>
 #include <notify.h>
 #include <ioreq.h>
-#include <libkern.h>
+#include <memory.h>
 #include <string.h>
 #include <sys/errno.h>
 
@@ -79,7 +79,7 @@ int AddTtyDevFile(const char *name, File_t *cons) {
   TtyState_t *tty;
   int error;
 
-  if (!(tty = kmalloc(sizeof(TtyState_t))))
+  if (!(tty = MemAlloc(sizeof(TtyState_t), 0)))
     return ENOMEM;
   tty->cons = cons;
   tty->cons->nonblock = 1;

diff --git a/examples/filesys/reader.c b/examples/filesys/reader.c
@@ -2,7 +2,7 @@
 #include <FreeRTOS/task.h>
 
 #include <stdlib.h>
-#include <libkern.h>
+#include <memory.h>
 
 #include "filesys.h"
 
@@ -30,7 +30,7 @@ static void vReaderTask(__unused void *data) {
   FsMount();
 
   unsigned seed = (intptr_t)xTaskGetCurrentTaskHandle();
-  uint8_t *buf = pvPortMalloc(BUFSIZE);
+  uint8_t *buf = MemAlloc(BUFSIZE, 0);
   int n = DirectorySize();
 
   for (;;) {

diff --git a/examples/floppy/main.c b/examples/floppy/main.c
@@ -3,6 +3,7 @@
 #include <FreeRTOS/semphr.h>
 
 #include <driver.h>
+#include <memory.h>
 #include <floppy.h>
 #include <interrupt.h>
 #include <file.h>
@@ -42,7 +43,7 @@ static uint32_t FastRand(void) {
 extern uint32_t crc32(const uint8_t *frame, size_t frame_len);
 
 static void vReaderTask(File_t *fd) {
-  void *data = pvPortMalloc(SECTOR_SIZE);
+  void *data = MemAlloc(SECTOR_SIZE, 0);
 
   for (;;) {
     vTaskDelay(1000 / portTICK_PERIOD_MS);
@@ -72,7 +73,7 @@ static void vReaderTask(File_t *fd) {
 }
 
 static void vWriterTask(File_t *fd) {
-  uint32_t *data = pvPortMalloc(SECTOR_SIZE);
+  uint32_t *data = MemAlloc(SECTOR_SIZE, 0);
   DASSERT(data != NULL);
 
   for (;;) {

diff --git a/examples/preemption/main.c b/examples/preemption/main.c
@@ -2,7 +2,8 @@
 #include <FreeRTOS/task.h>
 
 #include <interrupt.h>
-#include <libkern.h>
+#include <debug.h>
+#include <memory.h>
 #include <stdlib.h>
 
 #define RED_TASK_PRIORITY 2
@@ -25,8 +26,8 @@ static void RandMalloc(void) {
     return;
 
   int sz = 1 + (rand() % MAXBLKSZ);
-  void *p = kmalloc(sz);
-  klog("malloc(%d) = %x\n", sz, p);
+  void *p = MemAlloc(sz, 0);
+  Log("malloc(%d) = %x\n", sz, p);
   Slot[FreeSlot++] = p;
 }
 
@@ -36,8 +37,8 @@ static void RandFree(void) {
 
   int n = rand() % FreeSlot;
   void *p = Slot[n];
-  kfree(p);
-  klog("free(%p)\n", p);
+  MemFree(p);
+  Log("free(%p)\n", p);
   Slot[n] = NULL;
 
   int last = --FreeSlot;
@@ -52,15 +53,15 @@ static void RandRealloc(void) {
   int n = rand() % FreeSlot;
   void *p = Slot[n];
   int sz = 1 + (rand() % MAXBLKSZ);
-  void *q = krealloc(p, sz);
-  klog("realloc(%p, %d) = %p\n", p, sz, q);
+  void *q = MemRealloc(p, sz);
+  Log("realloc(%p, %d) = %p\n", p, sz, q);
   Slot[n] = q;
 }
 
 static void vTestHeapTask(__unused void *data) {
   for (short i = 0; i < NSLOTS * 3 / 4; i++)
     RandMalloc();
-  kmcheck(0);
+  MemCheck(0);
 
   for (;;) {
     int c = rand() % 4;
@@ -70,7 +71,7 @@ static void vTestHeapTask(__unused void *data) {
       RandFree();
     else
       RandRealloc();
-    kmcheck(0);
+    MemCheck(0);
     vTaskDelay(1);
   }
 }

diff --git a/examples/startup.c b/examples/startup.c
@@ -3,22 +3,21 @@
 #include <cpu.h>
 #include <cia.h>
 #include <boot.h>
-#include <libkern.h>
 
 #define DEBUG 0
 #include <debug.h>
 
 extern int main(void);
 
 void _start(BootData_t *aBootData) {
-  klog("FreeRTOS running on Amiga!\n");
-  klog("VBR at $%08x\n", aBootData->bd_vbr);
-  klog("CPU model $%02x\n", aBootData->bd_cpumodel);
-  klog("Entry point at $%08x\n", aBootData->bd_entry);
+  Log("FreeRTOS running on Amiga!\n");
+  Log("VBR at $%08x\n", aBootData->bd_vbr);
+  Log("CPU model $%02x\n", aBootData->bd_cpumodel);
+  Log("Entry point at $%08x\n", aBootData->bd_entry);
 
   for (int i = 0; i < aBootData->bd_nregions; i++)
-    klog("MEM[%d]: %08x - %08x\n", i, aBootData->bd_region[i].mr_lower,
-         aBootData->bd_region[i].mr_upper);
+    Log("MEM[%d]: %08x - %08x\n", i, aBootData->bd_region[i].mr_lower,
+        aBootData->bd_region[i].mr_upper);
 
   DASSERT(custom.intenar == 0);
   DASSERT((custom.dmaconr & DMAF_ALL) == 0);

diff --git a/examples/unix/main.c b/examples/unix/main.c
@@ -7,7 +7,7 @@
 #include <file.h>
 #include <filedesc.h>
 #include <proc.h>
-#include <libkern.h>
+#include <debug.h>
 #include <tty.h>
 
 static File_t *FloppyOpen(const char *path) {
@@ -27,7 +27,7 @@ static void vMainTask(__unused void *data) {
   if (ProcLoadImage(&p, init)) {
     ProcSetArgv(&p, (char *[]){"init", NULL});
     ProcEnter(&p);
-    klog("Program returned: %d\n", p.exitcode);
+    Log("Program returned: %d\n", p.exitcode);
   }
   ProcFini(&p);
 

diff --git a/kernel/Makefile b/kernel/Makefile
@@ -8,7 +8,7 @@ SOURCES = amigahunk.c \
 	  event.c \
 	  intr.S \
 	  intsrv.c \
-	  malloc.c \
+	  memory.c \
 	  msgport.c \
 	  notify.c \
 	  pipe.c \

diff --git a/kernel/amigahunk.c b/kernel/amigahunk.c
@@ -1,10 +1,10 @@
-#include <FreeRTOS/FreeRTOS.h>
 #include <amigahunk.h>
 #include <strings.h>
 #include <stdlib.h>
-#include <libkern.h>
+#include <memory.h>
 
 #define DEBUG 0
+#include <debug.h>
 
 #define HUNK_CODE 1001
 #define HUNK_DATA 1002
@@ -39,8 +39,8 @@ static bool AllocHunks(File_t *fh, Hunk_t **hunkArray, short hunkCount) {
     /* size specifiers including memory attribute flags */
     uint32_t n = ReadLong(fh);
 
-    Hunk_t *hunk = ((n & HUNKF_CHIP) ? pvPortMallocChip : pvPortMalloc)(
-      sizeof(Hunk_t) + n * sizeof(int));
+    Hunk_t *hunk = MemAlloc(sizeof(Hunk_t) + n * sizeof(int),
+                            (n & HUNKF_CHIP) ? MF_CHIP : 0);
     *hunkArray++ = hunk;
 
     if (!hunk)
@@ -153,7 +153,7 @@ Hunk_t *LoadHunkList(File_t *fh) {
 void FreeHunkList(Hunk_t *hunk) {
   do {
     Hunk_t *next = hunk->next;
-    vPortFree(hunk);
+    MemFree(hunk);
     hunk = next;
   } while (hunk);
 }
diff --git a/kernel/devfile.c b/kernel/devfile.c
@@ -3,7 +3,8 @@
 #include <FreeRTOS/atomic.h>
 
 #include <file.h>
-#include <libkern.h>
+#include <debug.h>
+#include <memory.h>
 #include <string.h>
 #include <devfile.h>
 #include <event.h>
@@ -50,7 +51,7 @@ int AddDevFile(const char *name, DevFileOps_t *ops, DevFile_t **devp) {
     goto leave;
   }
 
-  if (!(dev = kmalloc(sizeof(DevFile_t)))) {
+  if (!(dev = MemAlloc(sizeof(DevFile_t), 0))) {
     error = ENOMEM;
     goto leave;
   }
@@ -63,7 +64,7 @@ int AddDevFile(const char *name, DevFileOps_t *ops, DevFile_t **devp) {
   if (devp)
     *devp = dev;
 
-  klog("Registered \'%s\' device file.\n", name);
+  Log("Registered \'%s\' device file.\n", name);
 
 leave:
   xTaskResumeAll();
@@ -82,7 +83,7 @@ int OpenDevFile(const char *name, File_t **fp) {
     goto leave;
   }
 
-  if (!(f = kcalloc(1, sizeof(File_t)))) {
+  if (!(f = MemAlloc(sizeof(File_t), MF_ZERO))) {
     error = ENOMEM;
     goto leave;
   }