Karutoh/CustomHeapManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oops forgot the last of the changes

Browse Source
This commit is contained in:
Gregory Kenneth Bowne 2024-02-14 16:55:09 -08:00
parent f83a00f4d5
commit 3305ef401c
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.c
View File

@ -1,19 +1,11 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
<<<<<<< HEAD
#include <stdlib.h> #include <stdlib.h>
=======
#include <sys/syscall.h>
>>>>>>> origin/main
#define ALIGN16(s) (((s) + 15) & ~0x0F) #define ALIGN16(s) (((s) + 15) & ~0x0F)
#define BLOCK_SIZE sizeof(struct block) #define BLOCK_SIZE sizeof(struct block)
<<<<<<< HEAD
#define MINIMUM_BLOCK_SIZE (sizeof(struct block) + 16) #define MINIMUM_BLOCK_SIZE (sizeof(struct block) + 16)
=======
#define MINIMUM_BLOCK_SIZE 4
>>>>>>> origin/main
/// The memory block's header. /// The memory block's header.
struct block struct block
@ -36,18 +28,12 @@ struct block *extend_heap(size_t s)
if (s < MINIMUM_BLOCK_SIZE) if (s < MINIMUM_BLOCK_SIZE)
s = MINIMUM_BLOCK_SIZE; s = MINIMUM_BLOCK_SIZE;
<<<<<<< HEAD
struct block *b = (struct block *)sbrk(0); // Get the current break struct block *b = (struct block *)sbrk(0); // Get the current break
// Add the size of the block header to the requested size // Add the size of the block header to the requested size
s += BLOCK_SIZE; s += BLOCK_SIZE;
if (sbrk(s) == (void *)-1) // Extend the break by s bytes if (sbrk(s) == (void *)-1) // Extend the break by s bytes
=======
struct block* b = (struct block*)syscall(SYS_brk, NULL);
if ((void*)syscall(SYS_brk, (char*)(b + 1) + s) == (void*)-1)
>>>>>>> origin/main
return NULL; return NULL;
b->size = s; b->size = s;