Refactor bigval_t struct and move it to gc-common.h

JuliaLang · Dec 2, 2024 · 6a01c26 · 6a01c26
1 parent 52c76b1
commit 6a01c26
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 53 deletions.
diff --git a/src/gc-common.h b/src/gc-common.h
@@ -24,6 +24,31 @@
 extern "C" {
 #endif
 
+// =========================================================================== //
+// GC Big objects
+// =========================================================================== //
+
+JL_EXTENSION typedef struct _bigval_t {
+    struct _bigval_t *next;
+    struct _bigval_t *prev;
+    size_t sz;
+#ifdef _P64 // Add padding so that the value is 64-byte aligned
+    // (8 pointers of 8 bytes each) - (4 other pointers in struct)
+    void *_padding[8 - 4];
+#else
+    // (16 pointers of 4 bytes each) - (4 other pointers in struct)
+    void *_padding[16 - 4];
+#endif
+    //struct jl_taggedvalue_t <>;
+    union {
+        uintptr_t header;
+        struct {
+            uintptr_t gc:2;
+        } bits;
+    };
+    // must be 64-byte aligned here, in 32 & 64 bit modes
+} bigval_t;
+
 // =========================================================================== //
 // GC Callbacks
 // =========================================================================== //

diff --git a/src/gc-mmtk.c b/src/gc-mmtk.c
@@ -1,6 +1,5 @@
 #include "gc-common.h"
 #include "mmtkMutator.h"
-#include "gc-mmtk.h"
 #include "threading.h"
 
 // File exists in the binding

diff --git a/src/gc-mmtk.h b/src/gc-mmtk.h
diff --git a/src/gc-stock.h b/src/gc-stock.h
@@ -19,6 +19,7 @@
 #include "julia_internal.h"
 #include "julia_assert.h"
 #include "threading.h"
+#include "gc-common.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -84,27 +85,6 @@ typedef struct _jl_gc_chunk_t {
 
 extern uintptr_t gc_bigval_sentinel_tag;
 
-JL_EXTENSION typedef struct _bigval_t {
-    struct _bigval_t *next;
-    struct _bigval_t *prev;
-    size_t sz;
-#ifdef _P64 // Add padding so that the value is 64-byte aligned
-    // (8 pointers of 8 bytes each) - (4 other pointers in struct)
-    void *_padding[8 - 4];
-#else
-    // (16 pointers of 4 bytes each) - (4 other pointers in struct)
-    void *_padding[16 - 4];
-#endif
-    //struct jl_taggedvalue_t <>;
-    union {
-        uintptr_t header;
-        struct {
-            uintptr_t gc:2;
-        } bits;
-    };
-    // must be 64-byte aligned here, in 32 & 64 bit modes
-} bigval_t;
-
 // pool page metadata
 typedef struct _jl_gc_pagemeta_t {
     // next metadata structure in per-thread list

diff --git a/src/llvm-late-gc-lowering-mmtk.cpp b/src/llvm-late-gc-lowering-mmtk.cpp
@@ -96,4 +96,4 @@ Value* LateLowerGCFrame::lowerGCAllocBytesLate(CallInst *target, Function &F)
         }
     }
     return target;
-}
+}
diff --git a/src/llvm-late-gc-lowering-stock.cpp b/src/llvm-late-gc-lowering-stock.cpp
@@ -6,4 +6,4 @@ Value* LateLowerGCFrame::lowerGCAllocBytesLate(CallInst *target, Function &F)
 {
     // Do nothing for the stock GC
     return target;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
         return target;
-    }
+    }