From 4e4639c2a04348a981037cf6e83756f49f22c506 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Mon, 21 Sep 2026 09:14:11 -0700 Subject: [PATCH] x64 does not belong in base - base is intended to be things we can assume everywhere, which explicitly disqualifies x64 by definition. --- src/base/base_core.h | 1 + src/base/base_inc.c | 3 --- src/base/base_inc.h | 1 - src/raddbg/raddbg_main.c | 4 ++-- src/third_party/radsort/radsort.h | 2 +- src/torture/torture_main.c | 2 ++ 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/base/base_core.h b/src/base/base_core.h index 580089af..2f2c4c48 100644 --- a/src/base/base_core.h +++ b/src/base/base_core.h @@ -21,6 +21,7 @@ #define STB_SPRINTF_DECORATE(name) raddbg_##name #define STB_SPRINTF_STATIC #include "third_party/stb/stb_sprintf.h" +#include "third_party/radsort/radsort.h" //////////////////////////////// //~ rjf: Codebase Keywords diff --git a/src/base/base_inc.c b/src/base/base_inc.c index 1cff7bf2..5a102437 100644 --- a/src/base/base_inc.c +++ b/src/base/base_inc.c @@ -30,9 +30,6 @@ #include "base_test.c" #include "base_entry_point.c" -// TODO: move x64 to base layer -#include "x64/x64.c" - #if OS_WINDOWS # include "win32/base/win32_base.c" #elif OS_LINUX diff --git a/src/base/base_inc.h b/src/base/base_inc.h index 3aa43a74..f83f8858 100644 --- a/src/base/base_inc.h +++ b/src/base/base_inc.h @@ -32,7 +32,6 @@ #include "base_test.h" #include "base_entry_point.h" -#include "x64/x64.h" #if OS_WINDOWS # include "win32/base/win32_base.h" #elif OS_LINUX diff --git a/src/raddbg/raddbg_main.c b/src/raddbg/raddbg_main.c index b2307cb8..abe98430 100644 --- a/src/raddbg/raddbg_main.c +++ b/src/raddbg/raddbg_main.c @@ -376,8 +376,8 @@ //- rjf: [h] #include "base/base_inc.h" +#include "x64/x64.h" #include "win32/win32_inc.h" -#include "linker/hash_table.h" #include "linker/base_ext/base_bit_array.h" #include "artifact_cache/artifact_cache.h" #include "rdi/rdi_local.h" @@ -438,8 +438,8 @@ //- rjf: [c] #include "base/base_inc.c" +#include "x64/x64.c" #include "win32/win32_inc.c" -#include "linker/hash_table.c" #include "linker/base_ext/base_bit_array.c" #include "artifact_cache/artifact_cache.c" #include "rdi/rdi_local.c" diff --git a/src/third_party/radsort/radsort.h b/src/third_party/radsort/radsort.h index dbfbd11c..7cf3146e 100644 --- a/src/third_party/radsort/radsort.h +++ b/src/third_party/radsort/radsort.h @@ -137,7 +137,7 @@ radsortmovesize( sizeof( (start)[0] ) ), \ //=================================================================================================== // small heap sort - this sort is around 200 bytes compiled - can use directly when size is important -internal RSFORCEINLINE void radheapsortinteral( void * start, size_t len, size_t element_size, is_before_func * is_before, swap_func * swapper ) +static RSFORCEINLINE void radheapsortinteral( void * start, size_t len, size_t element_size, is_before_func * is_before, swap_func * swapper ) { void * left; void * right; diff --git a/src/torture/torture_main.c b/src/torture/torture_main.c index e7fc5fb1..f9607b21 100644 --- a/src/torture/torture_main.c +++ b/src/torture/torture_main.c @@ -20,6 +20,7 @@ //////////////////////////////// #include "base/base_inc.h" +#include "x64/x64_inc.h" #include "linker/hash_table.h" #include "linker/lf_hash_table.h" #include "linker/base_ext/base_bit_array.h" @@ -103,6 +104,7 @@ #include "torture.h" #include "base/base_inc.c" +#include "x64/x64_inc.c" #include "linker/hash_table.c" #include "linker/lf_hash_table.c" #include "linker/base_ext/base_bit_array.c"