From edd1f308ce67b2c2ce34ec6928d6198fd6ba0637 Mon Sep 17 00:00:00 2001 From: dzaima Date: Sun, 11 Jul 2021 20:56:53 +0300 Subject: [PATCH] clean up mm macros & globals --- src/opt/mm_2buddy.h | 2 -- src/opt/mm_buddy.h | 1 - src/opt/mm_buddyTemplate.c | 4 ++++ src/opt/mm_buddyTemplate.h | 19 ------------------- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/opt/mm_2buddy.h b/src/opt/mm_2buddy.h index 8ffe93d4..afaa6169 100644 --- a/src/opt/mm_2buddy.h +++ b/src/opt/mm_2buddy.h @@ -10,7 +10,6 @@ extern u64 mm_heapAlloc; extern u64 mm_heapMax; #define BSZ(X) (1ull<<(X)) -#define MMI(X) X #define BN(X) b1_##X #define buckets b1_buckets #include "mm_buddyTemplate.h" @@ -19,7 +18,6 @@ extern u64 mm_heapMax; #undef BSZ #define BSZ(X) (3ull<<(X)) -#define MMI(X) ((X)|64) #define BN(X) b3_##X #define buckets b3_buckets #include "mm_buddyTemplate.h" diff --git a/src/opt/mm_buddy.h b/src/opt/mm_buddy.h index 7af25684..9cdef9ef 100644 --- a/src/opt/mm_buddy.h +++ b/src/opt/mm_buddy.h @@ -10,7 +10,6 @@ extern u64 mm_heapAlloc; extern u64 mm_heapMax; #define BSZ(X) (1ull<<(X)) -#define MMI(X) X #define BN(X) mm_##X #include "mm_buddyTemplate.h" diff --git a/src/opt/mm_buddyTemplate.c b/src/opt/mm_buddyTemplate.c index 712619b4..13266849 100644 --- a/src/opt/mm_buddyTemplate.c +++ b/src/opt/mm_buddyTemplate.c @@ -11,6 +11,10 @@ #endif EmptyValue* buckets[64]; +typedef struct AllocInfo { + Value* p; + u64 sz; +} AllocInfo; AllocInfo* al; u64 alCap; u64 alSize; diff --git a/src/opt/mm_buddyTemplate.h b/src/opt/mm_buddyTemplate.h index 0182e8c5..09a3516a 100644 --- a/src/opt/mm_buddyTemplate.h +++ b/src/opt/mm_buddyTemplate.h @@ -1,17 +1,4 @@ -#define AllocInfo BN(AllocInfo) -#define al BN(al) -#define alCap BN(alCap) -#define alSize BN(alSize) - extern EmptyValue* buckets[64]; -typedef struct AllocInfo { - Value* p; - u64 sz; -} AllocInfo; -extern AllocInfo* al; -extern u64 alCap; -extern u64 alSize; - static void BN(free)(Value* x) { onFree(x); @@ -54,9 +41,3 @@ static void* BN(allocL)(i64 bucket, u8 type) { #endif return x; } - -#undef MMI -#undef AllocInfo -#undef al -#undef alSize -#undef alCap