ubsan cleanup

src/base/base_core.c

@@ -79,19 +79,21 @@ u64_up_to_pow2(U64 x){
 }
 
 internal S32
-extend_sign32(U32 x, U32 size){
-  U32 high_bit = size * 8;
-  U32 shift = 32 - high_bit;
-  S32 result = ((S32)x << shift) >> shift;
-  return result;
+extend_sign32(U32 x, U32 size)
+{
+  U32 n = size * 8;
+  U32 m = (U32)1 << (n - 1);
+  S32 r = (S32)((x ^ m) - m);
+  return r;
 }
 
 internal S64
-extend_sign64(U64 x, U64 size){
-  U64 high_bit = size * 8;
-  U64 shift = 64 - high_bit;
-  S64 result = ((S64)x << shift) >> shift;
-  return result;
+extend_sign64(U64 x, U64 size)
+{
+  U64 n = size * 8;
+  U64 m = (U64)1 << (n - 1);
+  S64 r = (S64)((x ^ m) - m);
+  return r;
 }
 
 internal F32
@@ -286,6 +288,44 @@ memory_is_zero(void *ptr, U64 size)
   return result;
 }
 
+internal void UBSAN_NO_ALIGN
+memory_write32(void *ptr, U32 v)
+{
+  MemoryCopy(ptr, &v, sizeof(v));
+}
+
+internal U8 UBSAN_NO_ALIGN
+memory_read8(void *ptr)
+{
+  U8 result;
+  MemoryCopy(&result, ptr, sizeof(result));
+  return result;
+}
+
+internal U16 UBSAN_NO_ALIGN
+memory_read16(void *ptr)
+{
+  U16 result;
+  MemoryCopy(&result, ptr, sizeof(result));
+  return result;
+}
+
+internal U32 UBSAN_NO_ALIGN
+memory_read32(void *ptr)
+{
+  U32 result;
+  MemoryCopy(&result, ptr, sizeof(result));
+  return result;
+}
+
+internal U64 UBSAN_NO_ALIGN
+memory_read64(void *ptr)
+{
+  U64 result;
+  MemoryCopy(&result, ptr, sizeof(result));
+  return result;
+}
+
 ////////////////////////////////
 //~ rjf: Text 2D Coordinate/Range Functions
 

src/base/base_core.h

@@ -7,12 +7,13 @@
 ////////////////////////////////
 //~ rjf: Foreign Includes
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <inttypes.h>
 #include <math.h>
 #include <string.h>
-#include <stdint.h>
-#include <inttypes.h>
 
 ////////////////////////////////
 //~ rjf: Third Party Includes
@@ -181,8 +182,9 @@
 //~ rjf: Member Offsets
 
 #define Member(T,m)                 (((T*)0)->m)
-#define OffsetOf(T,m)               IntFromPtr(&Member(T,m))
+#define OffsetOf(T,m)               offsetof(T, m)
 #define MemberFromOffset(T,ptr,off) (T)((((U8 *)ptr)+(off)))
+#define MemberFromPtr(T,ptr,m)      (void*)((((U8 *)ptr)+OffsetOf(T,m)))
 #define CastFromMember(T,m,ptr)     (T*)(((U8*)ptr) - OffsetOf(T,m))
 
 ////////////////////////////////
@@ -366,9 +368,9 @@ CheckNil(nil,p) ? \
 #if COMPILER_MSVC
 # if defined(__SANITIZE_ADDRESS__)
 #  define ASAN_ENABLED 1
-#  define NO_ASAN __declspec(no_sanitize_address)
+#  define ASAN_NO_ADDR __declspec(no_sanitize_address)
 # else
-#  define NO_ASAN
+#  define UBSAN_NO_ALIGN
 # endif
 #elif COMPILER_CLANG
 # if defined(__has_feature)
@@ -376,9 +378,15 @@ CheckNil(nil,p) ? \
 #   define ASAN_ENABLED 1
 #  endif
 # endif
-# define NO_ASAN __attribute__((no_sanitize("address")))
-#else
-# define NO_ASAN
+# define ASAN_NO_ADDR   __attribute__((no_sanitize("address")))
+# define UBSAN_NO_ALIGN __attribute__((no_sanitize("alignment")))
+#endif
+
+#ifndef  ASAN_NO_ADDR
+# define ASAN_NO_ADDR
+#endif
+#ifndef  UBSAN_NO_ALIGN
+# define UBSAN_NO_ALIGN
 #endif
 
 #if ASAN_ENABLED
@@ -1001,6 +1009,13 @@ internal F32 sign_from_side_F32(Side side);
 
 internal B32 memory_is_zero(void *ptr, U64 size);
 
+internal void memory_write32(void *ptr, U32 v);
+
+internal U8  memory_read8(void *ptr);
+internal U16 memory_read16(void *ptr);
+internal U32 memory_read32(void *ptr);
+internal U64 memory_read64(void *ptr);
+
 ////////////////////////////////
 //~ rjf: Text 2D Coordinate/Range Functions