[mycpp/runtime refactor] Remove uses of OBJ_HEADER() macro

Just use the ObjHeader struct.
oils-for-unix · Dec 25, 2022 · 1eb2359 · 1eb2359
1 parent 36bae9a
commit 1eb2359
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/mycpp/gc_list.h b/mycpp/gc_list.h
@@ -16,7 +16,7 @@ class ValueError;
 template <typename T, int N>
 class GlobalList {
  public:
-  OBJ_HEADER()
+  ObjHeader header_;
   int len_;
   int capacity_;
   GlobalSlab<T, N>* slab_;
@@ -407,11 +407,11 @@ List<T>* list(List<T>* other) {
   return result;
 }
 
-#define GLOBAL_LIST(T, N, name, array)                                      \
-  GlobalSlab<T, N> _slab_##name = {Tag::Global, 0, kZeroMask, kNoObjLen,    \
-                                   array};                                  \
-  GlobalList<T, N> _list_##name = {Tag::Global, 0, kZeroMask,    kNoObjLen, \
-                                   N,           N, &_slab_##name};          \
+#define GLOBAL_LIST(T, N, name, array)                                     \
+  GlobalSlab<T, N> _slab_##name = {{Tag::Global, 0, kZeroMask, kNoObjLen}, \
+                                   array};                                 \
+  GlobalList<T, N> _list_##name = {                                        \
+      {Tag::Global, 0, kZeroMask, kNoObjLen}, N, N, &_slab_##name};        \
   List<T>* name = reinterpret_cast<List<T>*>(&_list_##name);
 
 template <class T>

diff --git a/mycpp/gc_obj.h b/mycpp/gc_obj.h
@@ -40,7 +40,7 @@ const uint8_t kMycppDebugType = 255;
 //   And we can sort integers BEFORE pointers.
 
 // TODO: ./configure could detect big or little endian, and then flip the
-// fields in OBJ_HEADER?
+// fields in Obj?
 //
 // https://stackoverflow.com/questions/2100331/c-macro-definition-to-determine-big-endian-or-little-endian-machine
 //
@@ -107,7 +107,7 @@ class Obj {
 
 class _DummyObj {  // For maskbit()
  public:
-  OBJ_HEADER()
+  ObjHeader header_;
   int first_field_;
 };
 
@@ -116,7 +116,7 @@ class _DummyObj {  // For maskbit()
 //
 // - Note that we only call maskbit() on offsets of pointer fields, which must
 //   be POINTER-ALIGNED.
-// - _DummyObj is used in case OBJ_HEADER() requires padding, then
+// - _DummyObj is used in case ObjHeader requires padding, then
 //   sizeof(Obj) != offsetof(_DummyObj, first_field_)
 
 constexpr int maskbit(int offset) {
@@ -126,7 +126,7 @@ constexpr int maskbit(int offset) {
 class _DummyObj_v {  // For maskbit_v()
  public:
   void* vtable;  // how the compiler does dynamic dispatch
-  OBJ_HEADER()
+  ObjHeader header_;
   int first_field_;
 };
 

diff --git a/mycpp/gc_slab.h b/mycpp/gc_slab.h
@@ -44,8 +44,7 @@ class GlobalSlab {
   // A template type with the same layout as Str with length N-1 (which needs a
   // buffer of size N).  For initializing global constant instances.
  public:
-  OBJ_HEADER()
-
+  ObjHeader header_;
   T items_[N];
 
   DISALLOW_COPY_AND_ASSIGN(GlobalSlab)

diff --git a/mycpp/gc_str.h b/mycpp/gc_str.h
@@ -179,8 +179,7 @@ class GlobalStr {
   // A template type with the same layout as Str with length N-1 (which needs a
   // buffer of size N).  For initializing global constant instances.
  public:
-  OBJ_HEADER()
-
+  ObjHeader header_;
   int hash_value_;
   const char data_[N];
 
@@ -195,9 +194,11 @@ class GlobalStr {
 // https://old.reddit.com/r/cpp_questions/comments/j0khh6/how_to_constexpr_initialize_class_member_thats/
 // https://stackoverflow.com/questions/10422487/how-can-i-initialize-char-arrays-in-a-constructor
 
-#define GLOBAL_STR(name, val)                                            \
-  GlobalStr<sizeof(val)> _##name = {                                     \
-      Tag::Global, 0, kZeroMask, kStrHeaderSize + sizeof(val), -1, val}; \
+#define GLOBAL_STR(name, val)                                              \
+  GlobalStr<sizeof(val)> _##name = {                                       \
+      {Tag::Global, kStrTypeTag, kZeroMask, kStrHeaderSize + sizeof(val)}, \
+      -1,                                                                  \
+      val};                                                                \
   Str* name = reinterpret_cast<Str*>(&_##name);
 
 #endif  // MYCPP_GC_STR_H