From 2e79a2e5af3affa7a6a3becdffb1c91d89af90af Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Mon, 11 Jul 2022 21:54:51 +0200
Subject: user: reorganize the userland sources

---
 src/init/malloc.c | 65 -------------------------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 src/init/malloc.c

(limited to 'src/init/malloc.c')

diff --git a/src/init/malloc.c b/src/init/malloc.c
deleted file mode 100644
index eb63d82..0000000
--- a/src/init/malloc.c
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <init/malloc.h>
-#include <shared/flags.h>
-#include <shared/syscalls.h>
-#include <stdbool.h>
-
-#include <init/stdlib.h>
-
-#define MBLOCK_MAGIC 0x1337BABE
-
-struct mblock {
-	uint32_t magic;
-	size_t length; // including this struct
-	bool used;
-	struct mblock *next;
-};
-
-static struct mblock *first = NULL, *last = NULL;
-static struct mblock *expand(size_t size);
-
-void *malloc(size_t size) {
-	struct mblock *iter = first;
-	size += sizeof(struct mblock);
-	while (iter) {
-		if (!iter->used && iter->length >= size)
-			break;
-		iter = iter->next;
-	}
-
-	if (!iter) iter = expand(size);
-	if (!iter) return NULL;
-
-	iter->used = true;
-	// TODO truncate and split
-
-	return &iter[1];
-}
-
-void free(void *ptr) {
-	struct mblock *block = ptr - sizeof(struct mblock);
-	if (block->magic != MBLOCK_MAGIC) {
-		// TODO debug log switch
-		printf("didn't find MBLOCK_MAGIC @ 0x%x\n", block);
-		return;
-	}
-
-	block->used = false;
-}
-
-static struct mblock *expand(size_t size) {
-	struct mblock *block = _syscall_memflag(0, size, MEMFLAG_PRESENT | MEMFLAG_FINDFREE);
-	if (!block) return NULL;
-
-	block->magic = MBLOCK_MAGIC;
-	block->length = size;
-	block->used = false;
-	block->next = NULL;
-
-	if (!first) first = block;
-	if (last) last->next = block;
-	last = block;
-
-	// TODO collapse
-
-	return block;
-}
-- 
cgit v1.2.3