Memory manager refactor

Author: 7bitcoder

Source/Library/MemoryManager.cpp

@@ -1,7 +1,7 @@
 #include <setjmp.h>
 
-#include "MemoryManager.hpp"
 #include "DetectOs.hpp"
+#include "MemoryManager.hpp"
 
 #ifdef WINDOWS
 
@@ -13,12 +13,12 @@
 
 #ifdef LINUX
 #include <iostream>
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
-#include <pthread.h>
 
 #endif
 
@@ -30,34 +30,37 @@ namespace sd
 #define __READ_RBP(rbp) __asm__ volatile("movq %%rbp, %0" : "=r"(rbp))
 #define __READ_RSP(rsp) __asm__ volatile("movq %%rsp, %0" : "=r"(rsp))
 
+        auto getStackRsp()
+        {
+            intptr_t *rsp;
+            __READ_RSP(rsp);
+            return rsp;
+        }
+
+        auto makeStackInfo(uint8_t *top, uint8_t *bot) { return std::make_tuple(top, bot, (uint8_t *)getStackRsp()); }
 #ifdef WINDOWS
 
         auto getStackBounds()
         {
-            intptr_t *rsp;
-            __READ_RSP(rsp);
-            ULONG_PTR lowLimit;
-            ULONG_PTR highLimit;
+            ULONG_PTR lowLimit, highLimit;
             GetCurrentThreadStackLimits(&lowLimit, &highLimit);
 
-            return std::make_tuple((uint8_t *)highLimit - 10, (uint8_t *)lowLimit, (uint8_t *)rsp);
+            return makeStackInfo((uint8_t *)highLimit - 10, (uint8_t *)lowLimit);
         }
 
-#endif
-#ifdef LINUX
+#elif LINUX
 
         auto getStackBounds()
         {
-            intptr_t *rsp;
-            __READ_RSP(rsp);
             pthread_attr_t attrs;
             pthread_getattr_np(pthread_self(), &attrs);
-            void* stack_ptr;
+            void *stack_ptr;
             size_t stack_size;
             pthread_attr_getstack(&attrs, &stack_ptr, &stack_size);
-            return std::make_tuple((uint8_t *)stack_ptr + stack_size - 10, (uint8_t *)rsp, (uint8_t *)rsp);
-        }
+            void *lowLimit = stack_ptr, highLimit = stack_ptr + stack_size - 10;
 
+            return makeStackInfo((uint8_t *)highLimit, (uint8_t *)lowLimit);
+        }
 #endif
 
     } // namespace
@@ -87,7 +90,7 @@ namespace sd
 
     void MemoryManager::clear()
     {
-        _register.forEach([this](auto &object) { destroy(object); });
+        _register.forEach([this](Object &object) { destroy(object); });
         _register.clear();
     }
 
@@ -124,7 +127,7 @@ namespace sd
 
     void MemoryManager::sweep()
     {
-        _register.unregisterIf([this](auto &object) {
+        _register.unregisterIf([this](Object &object) {
             if (object.isMarked())
             {
                 object.unmark();

Source/Library/h/DetectOs.hpp

@@ -1,11 +1,39 @@
 #pragma once
 
-#ifdef _WIN32
-
+#if defined(_WIN64) || defined(_WIN32)
 #define WINDOWS
+
+#ifdef _WIN64
+// define something for Windows (64-bit only)
+#else
+// define something for Windows (32-bit only)
 #endif
 
-#ifdef linux
+#elif __APPLE__
+#include "TargetConditionals.h"
+#define APPLE
+
+#if TARGET_OS_IPHONE && TARGET_OS_SIMULATOR
+// define something for simulator
+// (although, checking for TARGET_OS_IPHONE should not be required).
+#elif TARGET_OS_IPHONE && TARGET_OS_MACCATALYST
+// define something for Mac's Catalyst
+#elif TARGET_OS_IPHONE
+// define something for iphone
+#else
+#define TARGET_OS_OSX 1
+// define something for OSX
+#endif
 
+#elif defined(__linux) || defined(__unix) || defined(__posix)
 #define LINUX
+
+#ifdef __linux
+// linux
+#elif __unix // all unices not caught above
+// Unix
+#elif __posix
+// POSIX
+#endif
+
 #endif

Source/Library/h/MemoryManager.hpp

@@ -35,14 +35,14 @@ namespace sd
 
                 size_t getSize() const { return _size; }
                 Deleter getDeleter() const { return _deleter; }
-
-              private:
             };
 
             template <class T> struct Type
             {
                 template <class... A> static T *create(A &&...args) { return new T(std::forward<A>(args)...); };
+
                 static void destroy(void *objectPtr) { delete reinterpret_cast<T *>(objectPtr); }
+
                 static TypeInfo *getInfo()
                 {
                     static TypeInfo *info = new TypeInfo{sizeof(T), &destroy};
@@ -103,9 +103,10 @@ namespace sd
           public:
             void registerNew(const Object &object) { _objectsMap.insert({object.getRawPtr(), object}); }
             bool contains(void *objectPtr) const { return _objectsMap.contains(objectPtr); }
-            void clear() { _objectsMap.clear(); }
             Object &getObject(void *objectPtr) { return _objectsMap.at(objectPtr); }
 
+            void clear() { _objectsMap.clear(); }
+
             size_t numberOfRegisteredObjects() const { return _objectsMap.size(); }
             bool anyObjectRegistered() const { return _objectsMap.empty(); }