From 306a76cb444102bc207ee16e8a65aa9e90bbd37a Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Sun, 5 Mar 2023 12:32:38 -0400 Subject: global: Start work on making the codebase match without inlining It seems more, and more obvious that the codebase was originally compiled without inlining. --- context.h | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'context.h') diff --git a/context.h b/context.h index f4a4a17..95824e4 100644 --- a/context.h +++ b/context.h @@ -147,7 +147,7 @@ typedef long ptrdiff_t; if (flags != old_flags) { \ TMainTask *child; \ u32 bit = 1; \ - FOREACH_NODE_NODECL_MULTI_ITER(TMainTask, main_task.down(), child, bit <<= 1) { \ + FOREACH_NODE_NODECL_MULTI_ITER(TMainTask, main_task.m_down, child, bit <<= 1) { \ if (flags & bit) { \ child->one_prefix##_##suffix(); \ } else { \ @@ -1029,9 +1029,8 @@ private: }; -protected: +public: const char *m_name; -private: union { object_flags m_flags; u16 m_flags_u16; @@ -1060,24 +1059,6 @@ public: void *operator new (size_t size) { return alloc(size); }; void operator delete(void *ptr) { free(ptr); }; - const char *name() { return m_name; }; - object_flags flags() { return m_flags; }; - u16 flags_u16() { return m_flags_u16; }; - u16 id() { return m_id; }; - TObject *prev() { return m_prev; }; - TObject *next() { return m_next; }; - TObject *up() { return m_up; }; - TObject *down() { return m_down; }; - - void set_name(const char *name) { m_name = name; }; - void set_obj_flags(object_flags flags) { m_flags = flags; }; - void set_flags_u16(u16 flags) { m_flags_u16 = flags; }; - void set_id(u16 id) { m_id = id; }; - void set_prev(TObject *node) { m_prev = node; }; - void set_next(TObject *node) { m_next = node; }; - void set_up(TObject *node) { m_up = node; }; - void set_down(TObject *node) { m_down = node; }; - void delete_children(); void queue_destruction_for_each_node(); void run_tasks(); @@ -1202,7 +1183,7 @@ public: }; // pso/TMainTask.h -class TMainTask : public TObject { +class TMainTask : private TObject { public: u32 task_flags; u32 mbr_0x20; -- cgit v1.2.3-13-gbd6f