From 7a95ada831b6ca585840a7e97d352be9b71dbb0b Mon Sep 17 00:00:00 2001 From: Ed_ Date: Sat, 1 Feb 2025 18:30:43 -0500 Subject: [PATCH] progress --- code/base/macros.h | 9 ++++ code/base/rarena.c | 5 ++ code/base/string.h | 1 + code/base/zpl_memory.h | 2 +- .../core/linux/os_coreLinux.c} | 0 .../core/linux/os_core_linux.h} | 10 ++-- .../metagen_os_core.c => os/core/os_core.c} | 0 .../metagen_os_core.h => os/core/os_core.h} | 0 .../core/win32/os_core_win32.c} | 0 .../core/win32/os_core_win32.h} | 0 .../metagen_os => os}/metagen_os_inc.c | 0 .../metagen_os => os}/metagen_os_inc.h | 0 gen_c11/c11.refactor | 48 +++++++++++++++++++ 13 files changed, 69 insertions(+), 6 deletions(-) rename code/{metagen/metagen_os/core/linux/metagen_os_core_linux.c => os/core/linux/os_coreLinux.c} (100%) rename code/{metagen/metagen_os/core/linux/metagen_os_core_linux.h => os/core/linux/os_core_linux.h} (97%) rename code/{metagen/metagen_os/core/metagen_os_core.c => os/core/os_core.c} (100%) rename code/{metagen/metagen_os/core/metagen_os_core.h => os/core/os_core.h} (100%) rename code/{metagen/metagen_os/core/win32/metagen_os_core_win32.c => os/core/win32/os_core_win32.c} (100%) rename code/{metagen/metagen_os/core/win32/metagen_os_core_win32.h => os/core/win32/os_core_win32.h} (100%) rename code/{metagen/metagen_os => os}/metagen_os_inc.c (100%) rename code/{metagen/metagen_os => os}/metagen_os_inc.h (100%) diff --git a/code/base/macros.h b/code/base/macros.h index e662d0f..6646867 100644 --- a/code/base/macros.h +++ b/code/base/macros.h @@ -1,4 +1,5 @@ #if MD_INTELLISENSE_DIRECTIVES +#pragma once #include "cstd.h" #endif @@ -22,6 +23,14 @@ #endif #endif // GEN_API +#ifndef global // Global variables +# ifdef MD_DYN_EXPORT +# define global +# else +# define global static +# endif +#endif + #ifndef internal #define internal static #endif diff --git a/code/base/rarena.c b/code/base/rarena.c index c7f3da7..901beac 100644 --- a/code/base/rarena.c +++ b/code/base/rarena.c @@ -1,3 +1,8 @@ +#ifdef MD_INTELLISENSE_DIRECTIVES +#pragma once +#include "rarena.h" +#endif + // Copyright (c) 2024 Epic Games Tools // Licensed under the MIT license (https://opensource.org/license/mit/) diff --git a/code/base/string.h b/code/base/string.h index 32f2016..14e7cb8 100644 --- a/code/base/string.h +++ b/code/base/string.h @@ -1,4 +1,5 @@ #if MD_INTELLISENSE_DIRECTIVES +#pragma once #include "base_types.h" #endif diff --git a/code/base/zpl_memory.h b/code/base/zpl_memory.h index 14dcd5b..eaeb0c1 100644 --- a/code/base/zpl_memory.h +++ b/code/base/zpl_memory.h @@ -71,7 +71,7 @@ void* alloc( AllocatorInfo a, SSIZE size ); void* alloc_align( AllocatorInfo a, SSIZE size, SSIZE alignment ); //! Free allocated memory. -void allocator_free( AllocatorInfo a, void* ptr ); +void alloc_free( AllocatorInfo a, void* ptr ); //! Free all memory allocated by an allocator. void free_all( AllocatorInfo a ); diff --git a/code/metagen/metagen_os/core/linux/metagen_os_core_linux.c b/code/os/core/linux/os_coreLinux.c similarity index 100% rename from code/metagen/metagen_os/core/linux/metagen_os_core_linux.c rename to code/os/core/linux/os_coreLinux.c diff --git a/code/metagen/metagen_os/core/linux/metagen_os_core_linux.h b/code/os/core/linux/os_core_linux.h similarity index 97% rename from code/metagen/metagen_os/core/linux/metagen_os_core_linux.h rename to code/os/core/linux/os_core_linux.h index a5dea2e..fae1d60 100644 --- a/code/metagen/metagen_os/core/linux/metagen_os_core_linux.h +++ b/code/os/core/linux/os_core_linux.h @@ -1,9 +1,11 @@ +#ifdef MD_INTELLISENSE_DIRECTIVES +#pragma once +#include +#endif + // Copyright (c) 2024 Epic Games Tools // Licensed under the MIT license (https://opensource.org/license/mit/) -#ifndef OS_CORE_LINUX_H -#define OS_CORE_LINUX_H - //////////////////////////////// //~ rjf: Includes @@ -130,5 +132,3 @@ internal void os_lnx_entity_release(OS_LNX_Entity *entity); //~ rjf: Thread Entry Point internal void *os_lnx_thread_entry_point(void *ptr); - -#endif // OS_CORE_LINUX_H diff --git a/code/metagen/metagen_os/core/metagen_os_core.c b/code/os/core/os_core.c similarity index 100% rename from code/metagen/metagen_os/core/metagen_os_core.c rename to code/os/core/os_core.c diff --git a/code/metagen/metagen_os/core/metagen_os_core.h b/code/os/core/os_core.h similarity index 100% rename from code/metagen/metagen_os/core/metagen_os_core.h rename to code/os/core/os_core.h diff --git a/code/metagen/metagen_os/core/win32/metagen_os_core_win32.c b/code/os/core/win32/os_core_win32.c similarity index 100% rename from code/metagen/metagen_os/core/win32/metagen_os_core_win32.c rename to code/os/core/win32/os_core_win32.c diff --git a/code/metagen/metagen_os/core/win32/metagen_os_core_win32.h b/code/os/core/win32/os_core_win32.h similarity index 100% rename from code/metagen/metagen_os/core/win32/metagen_os_core_win32.h rename to code/os/core/win32/os_core_win32.h diff --git a/code/metagen/metagen_os/metagen_os_inc.c b/code/os/metagen_os_inc.c similarity index 100% rename from code/metagen/metagen_os/metagen_os_inc.c rename to code/os/metagen_os_inc.c diff --git a/code/metagen/metagen_os/metagen_os_inc.h b/code/os/metagen_os_inc.h similarity index 100% rename from code/metagen/metagen_os/metagen_os_inc.h rename to code/os/metagen_os_inc.h diff --git a/gen_c11/c11.refactor b/gen_c11/c11.refactor index dd8f204..200a6b6 100644 --- a/gen_c11/c11.refactor +++ b/gen_c11/c11.refactor @@ -15,6 +15,24 @@ // base module +word global, md_global +word internal, md_internal +word local_persist, md_local_persist +word thread_static, md_thread_static + +word likely, md_likely +word unlikely, md_unlikely + +word ccast, word md_ccast +word pcast, word md_pcast +word rcast, word md_rcast +word scast, word md_scast + +word typeof, word md_typeof + +word enum_underlying, md_enum_underlying +word nullptr, md_nullptr + word U8, MD_U8 word U16, MD_U16 word U32, MD_U32 @@ -40,10 +58,40 @@ word B32, MD_B32 word swap, md_swap +word readonly, md_readonly + +word AllocType, MD_AllocType +word AllocatorProc, MD_AllocatorProc +word AllocatorInfo, MD_AllocatorInfo +word AllocFlag, MD_AllocFlag + +word alloc, md_alloc +word alloc_align, md_alloc_align +word free_mem, md_free_mem +word free_all, md_free_all +word resize, md_resize +word resize_align, md_resize_align + +word default_resize_align, md_default_resize_align + +word alloc_item, md_alloc_item +word alloc_array, md_alloc_array + +word heap_stats_init, md_heap_stats_init +word heap_stats_used_mem, md_heap_stats_used_mem +word heap_stats_alloc_count, md_heap_stats_alloc_count +word heap_stats_check, md_heap_stats_check +word heap_allocator_proc, md_heap_allocator_proc +word heap, md_heap + +word malloc, md_malloc +word mfree, md_mfree + word Rng1U64, MD_Rng1U64 word String8, MD_String8 + // metadesk module // word MsgKind, MD_MsgKind