schme/hiload
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow building with zig cc/c++

Browse Source
This commit is contained in:
Kasper
2025-05-29 23:10:28 +03:00
parent 4ad8861572
commit 61481a1fac
8 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -6,8 +6,10 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED) set(CMAKE_C_STANDARD_REQUIRED)
set(BUILD_AUDITOR OFF) set(BUILD_AUDITOR OFF CACHE BOOL "Build the independent auditor library.")
set(BUILD_TESTS OFF) set(BUILD_TESTS OFF CACHE BOOL "Build tests.")
# Conditionally define _GNU_SOURCE for Linux systems # Conditionally define _GNU_SOURCE for Linux systems
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
@@ -47,7 +49,9 @@ target_compile_options(hiload PRIVATE
$<$<COMPILE_LANGUAGE:C>:-Wno-declaration-after-statement -Wno-padded> $<$<COMPILE_LANGUAGE:C>:-Wno-declaration-after-statement -Wno-padded>
) )
target_link_libraries(hiload dl elf) target_link_libraries(hiload
dl
elf)
# Specify the public headers location # Specify the public headers location
target_include_directories(hiload PUBLIC target_include_directories(hiload PUBLIC

6
cmake/zig-toolchain.cmake Normal file
View File

@@ -0,0 +1,6 @@
set (CMAKE_C_COMPILER zig cc)
set (CMAKE_CXX_COMPILER zig c++)
set (CMAKE_C_COMPILER_TARGET ${TARGET})
set (CMAKE_CXX_COMPILER_TARGET ${TARGET})
set (USING_ZIG TRUE)

2
src/filewatcher/filewatcher.c
View File

@@ -179,7 +179,7 @@ static void file_watcher_ctx_destroy(FileWatcherContext *ctx) {
// Declare the thread func // Declare the thread func
int file_watcher_watch(void *arg); int file_watcher_watch(void *arg);
FileWatcher *filewatcher_create() { FileWatcher *filewatcher_create(void) {
// Allocate context // Allocate context
FileWatcher *fw = malloc(sizeof(FileWatcher)); FileWatcher *fw = malloc(sizeof(FileWatcher));

4
src/hiload.c
View File

@@ -236,7 +236,7 @@ int hi_init(size_t n, const char **enabled_modules) {
return 0; return 0;
} }
void hi_deinit() { void hi_deinit(void) {
moduler_deinit(); moduler_deinit();
module_data_free(&context.modules); module_data_free(&context.modules);
filewatcher_destroy(context.filewatcher); filewatcher_destroy(context.filewatcher);
@@ -244,7 +244,7 @@ void hi_deinit() {
memset(&context, 0, sizeof(context)); memset(&context, 0, sizeof(context));
} }
HiResult hi_reload() { HiResult hi_reload(void) {
handle_file_events(context.filewatcher, &context.modules); handle_file_events(context.filewatcher, &context.modules);
reload_dirty_modules(&context); reload_dirty_modules(&context);

2
src/logger.c
View File

@@ -8,6 +8,6 @@ void log_set_verbose(bool value) {
atomic_store_explicit(&hiload_verbose_log, value, memory_order_relaxed); atomic_store_explicit(&hiload_verbose_log, value, memory_order_relaxed);
} }
bool log_get_verbose() { bool log_get_verbose(void) {
return atomic_load_explicit(&hiload_verbose_log, memory_order_relaxed); return atomic_load_explicit(&hiload_verbose_log, memory_order_relaxed);
} }

35
src/logger.h
View File

@@ -3,7 +3,7 @@
#include "../3rd/sc/logger/sc_log.h" #include "../3rd/sc/logger/sc_log.h"
void log_set_verbose(bool value); void log_set_verbose(bool value);
bool log_get_verbose(); bool log_get_verbose(void);
#define log_init() (sc_log_init()) #define log_init() (sc_log_init())
#define log_set_level(level) (sc_log_set_level((level))) #define log_set_level(level) (sc_log_set_level((level)))
@@ -14,12 +14,27 @@ bool log_get_verbose();
#define log_warn(...) (sc_log_warn(__VA_ARGS__)) #define log_warn(...) (sc_log_warn(__VA_ARGS__))
#define log_error(...) (sc_log_error(__VA_ARGS__)) #define log_error(...) (sc_log_error(__VA_ARGS__))
#define log_debugv(...) do { if (log_get_verbose()) { \ #define log_debugv(...) \
log_debug(__VA_ARGS__); } } while(0) do { \
#define log_infov(...) do { if (log_get_verbose()) { \ if (log_get_verbose()) { \
log_info(__VA_ARGS__); } } while(0) log_debug(__VA_ARGS__); \
#define log_warnv(...) do { if (log_get_verbose()) { \ } \
log_warn(__VA_ARGS__); } } while(0) } while (0)
#define log_errorv(...) do { if (log_get_verbose()) { \ #define log_infov(...) \
log_error(__VA_ARGS__); } } while(0) do { \
if (log_get_verbose()) { \
log_info(__VA_ARGS__); \
} \
} while (0)
#define log_warnv(...) \
do { \
if (log_get_verbose()) { \
log_warn(__VA_ARGS__); \
} \
} while (0)
#define log_errorv(...) \
do { \
if (log_get_verbose()) { \
log_error(__VA_ARGS__); \
} \
} while (0)

5
src/moduler.c
View File

@@ -243,7 +243,6 @@ static HiResult moduler_patch_functions(VectorSymbol *psymbols,
return HI_FAIL; return HI_FAIL;
} }
int found_count = 0;
size_t rela_count = relasz / sizeof(ElfW(Rela)); size_t rela_count = relasz / sizeof(ElfW(Rela));
printf("Processing %zu relocations\n", rela_count); printf("Processing %zu relocations\n", rela_count);
@@ -277,8 +276,6 @@ static HiResult moduler_patch_functions(VectorSymbol *psymbols,
*got_entry = s->address; *got_entry = s->address;
log_debug("Found GOT entry for '%s' at %p (points to %p)\n", name, log_debug("Found GOT entry for '%s' at %p (points to %p)\n", name,
got_entry, *got_entry); got_entry, *got_entry);
found_count++;
} }
} }
} }
@@ -438,7 +435,7 @@ void moduler_init(const VectorModuleData *modules) {
} }
} }
void moduler_deinit() { void moduler_deinit(void) {
SymbolData symdata = {0}; SymbolData symdata = {0};
vector_foreach(&symbol_data, symdata) { symbols_term(&symdata.symbols); } vector_foreach(&symbol_data, symdata) { symbols_term(&symdata.symbols); }
vector_term(&symbol_data); vector_term(&symbol_data);

2
test/manual/minimal_lib.cpp
View File

@@ -5,7 +5,7 @@ namespace minimal_lib {
int getNewValue(int x) { int getNewValue(int x) {
static int value = 0; static int value = 0;
value = value + x; value = 42;
return value; return value;
} }