From 8e6a0ae4db65bbb375470718711b0f4a2f4f5845 Mon Sep 17 00:00:00 2001 From: Nikita Smith Date: Fri, 8 Nov 2024 11:30:16 -0800 Subject: [PATCH] errors and warnings fixes --- src/linker/lnk_chunk.c | 3 --- src/linker/lnk_chunk.h | 10 ++++++---- src/linker/lnk_config.c | 4 +--- src/linker/lnk_debug_info.c | 4 ++-- src/linker/lnk_error.h | 6 +++--- src/linker/lnk_symbol_table.c | 3 --- src/linker/lnk_symbol_table.h | 6 ++++-- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/linker/lnk_chunk.c b/src/linker/lnk_chunk.c index 97d5015c..f8fe8eb4 100644 --- a/src/linker/lnk_chunk.c +++ b/src/linker/lnk_chunk.c @@ -1,9 +1,6 @@ // Copyright (c) 2024 Epic Games Tools // Licensed under the MIT license (https://opensource.org/license/mit/) -global read_only LNK_Chunk g_null_chunk = { 0, 0, /* is_discarded: */ 1 }; -global read_only LNK_Chunk *g_null_chunk_ptr = &g_null_chunk; - internal LNK_ChunkRef lnk_chunk_ref(U64 sect_id, U64 chunk_id) { diff --git a/src/linker/lnk_chunk.h b/src/linker/lnk_chunk.h index 23d5dccb..ecef5f3d 100644 --- a/src/linker/lnk_chunk.h +++ b/src/linker/lnk_chunk.h @@ -43,8 +43,6 @@ typedef struct LNK_Chunk #if LNK_DEBUG_CHUNKS String8 debug; #endif - - int debug; } LNK_Chunk, * LNK_ChunkPtr; typedef struct LNK_ChunkNode @@ -115,8 +113,12 @@ typedef struct LNK_ChunkManager U64 total_chunk_count; } LNK_ChunkManager; -extern LNK_Chunk g_null_chunk; -extern LNK_Chunk *g_null_chunk_ptr; +//////////////////////////////// + +read_only global LNK_Chunk g_null_chunk = { 0, 0, /* is_discarded: */ 1 }; +read_only global LNK_Chunk *g_null_chunk_ptr = &g_null_chunk; + +//////////////////////////////// internal LNK_ChunkRef lnk_chunk_ref(U64 sect_id, U64 chunk_id); internal B32 lnk_chunk_ref_is_equal(LNK_ChunkRef a, LNK_ChunkRef b); diff --git a/src/linker/lnk_config.c b/src/linker/lnk_config.c index b8982d13..ceeb9577 100644 --- a/src/linker/lnk_config.c +++ b/src/linker/lnk_config.c @@ -506,7 +506,7 @@ lnk_get_mt_path(Arena *arena) #undef OS_WINDOWS #define OS_WINDOWS 1 #else - mt_path = str8_lit("llvm-mt.exe"); + String8 mt_path = str8_lit("llvm-mt.exe"); #endif return mt_path; } @@ -1914,10 +1914,8 @@ lnk_build_config(Arena *arena, int argc, char **argv) String8List raw_cmd_line = os_string_list_from_argcv(arena, argc, argv); -#if OS_WINDOWS // remove exe name first argument str8_list_pop_front(&raw_cmd_line); -#endif // init config LNK_Config *config = lnk_config_from_cmd_line(arena, raw_cmd_line); diff --git a/src/linker/lnk_debug_info.c b/src/linker/lnk_debug_info.c index 463749bc..9ede6cd7 100644 --- a/src/linker/lnk_debug_info.c +++ b/src/linker/lnk_debug_info.c @@ -2483,10 +2483,10 @@ lnk_format_u128(U8 *buf, U64 buf_max, U64 length, U128 v) if (length > 0 && buf_max > 0) { if (length <= 8) { U64 mask = length == 8 ? max_U64 : (1ull << (length*8)) - 1; - size = raddbg_snprintf((char*)buf, buf_max - 1, "%llX", v.u64[0] & mask); + size = raddbg_snprintf((char*)buf, buf_max - 1, "%llX", (long long)(v.u64[0] & mask)); } else { U64 mask1 = length == 16 ? max_U64 : (1ull << ((length-8)*8)) - 1; - size = raddbg_snprintf((char*)buf, buf_max, "%llX%llX", v.u64[1] & mask1, v.u64[0]); + size = raddbg_snprintf((char*)buf, buf_max, "%llX%llX", (long long)(v.u64[1] & mask1), (long long)v.u64[0]); } } return size; diff --git a/src/linker/lnk_error.h b/src/linker/lnk_error.h index 8d39de95..915451db 100644 --- a/src/linker/lnk_error.h +++ b/src/linker/lnk_error.h @@ -117,7 +117,7 @@ internal void lnk_suppress_error(LNK_ErrorCode code); internal LNK_ErrorCodeStatus lnk_get_error_code_status(LNK_ErrorCode code); internal void lnk_internal_error(LNK_InternalError code, char *file, int line, char *fmt, ...); -#define lnk_invalid_path(fmt, ...) lnk_internal_error(LNK_InternalError_InvalidPath, __FILE__, __LINE__, fmt, __VA_ARGS__) -#define lnk_not_implemented(fmt, ...) lnk_internal_error(LNK_InternalError_NotImplemented, __FILE__, __LINE__, fmt, __VA_ARGS__) -#define lnk_incomplete_switch(fmt, ...) lnk_internal_error(LNK_InternalError_IncompleteSwitch, __FILE__, __LINE__, fmt, __VA_ARGS__) +#define lnk_invalid_path(...) lnk_internal_error(LNK_InternalError_InvalidPath, __FILE__, __LINE__, __VA_ARGS__) +#define lnk_not_implemented(...) lnk_internal_error(LNK_InternalError_NotImplemented, __FILE__, __LINE__, __VA_ARGS__) +#define lnk_incomplete_switch(...) lnk_internal_error(LNK_InternalError_IncompleteSwitch, __FILE__, __LINE__, __VA_ARGS__) diff --git a/src/linker/lnk_symbol_table.c b/src/linker/lnk_symbol_table.c index 7543cccf..3332aa1b 100644 --- a/src/linker/lnk_symbol_table.c +++ b/src/linker/lnk_symbol_table.c @@ -1,9 +1,6 @@ // Copyright (c) 2024 Epic Games Tools // Licensed under the MIT license (https://opensource.org/license/mit/) -global read_only LNK_Symbol g_null_symbol = { str8_lit_comp("NULL"), LNK_Symbol_DefinedStatic }; -global read_only LNK_Symbol *g_null_symbol_ptr = &g_null_symbol; - internal void lnk_init_symbol(LNK_Symbol *symbol, String8 name, LNK_SymbolType type) { diff --git a/src/linker/lnk_symbol_table.h b/src/linker/lnk_symbol_table.h index e91403df..3426a17a 100644 --- a/src/linker/lnk_symbol_table.h +++ b/src/linker/lnk_symbol_table.h @@ -169,8 +169,10 @@ typedef struct //////////////////////////////// -extern LNK_Symbol g_null_symbol; -extern LNK_Symbol *g_null_symbol_ptr; +global read_only LNK_Symbol g_null_symbol = { str8_lit_comp("NULL"), LNK_Symbol_DefinedStatic }; +global read_only LNK_Symbol *g_null_symbol_ptr = &g_null_symbol; + +//////////////////////////////// internal void lnk_init_symbol(LNK_Symbol *symbol, String8 name, LNK_SymbolType type); internal void lnk_init_defined_symbol(LNK_Symbol *symbol, String8 name, LNK_DefinedSymbolVisibility visibility, LNK_DefinedSymbolFlags flags);