Slight refactor, added VM-relevant code ahead of C;C support and distinguished library includes from our own

Author: fl4tisjustice

src/RegionalDialect/Config.cpp

@@ -1,10 +1,11 @@
 
 #include <vector>
+#include <concepts>
 
-#include "log/logger_mgr.hpp"
-#include "skyline/utils/cpputils.hpp"
+#include <log/logger_mgr.hpp>
+#include <skyline/utils/cpputils.hpp>
 
-#include "RegionalDialect/Config.h"
+#include "Config.h"
 
 namespace rd {
 namespace config {
@@ -42,6 +43,10 @@ template<> char* JsonWrapper::get<char*>() {
     return ::cJSON_GetStringValue(inner);
 }
 
+template<> bool JsonWrapper::get<bool>() {
+    return static_cast<bool>(::cJSON_IsTrue(inner));
+}
+
 template<> std::vector<char*> JsonWrapper::get<std::vector<char*>>() {
     size_t size = (size_t)::cJSON_GetArraySize(inner);
     auto ret = std::vector<char*>();
@@ -79,22 +84,50 @@ void Init(std::string const& romMount) {
         free((void*)contents);
         return;
     }
+
     bool result = ::cJSON_AddItemToObject(inner, "gamedef", parseResult);
     if (!result || inner == NULL) {
         Logging.Log("Failed to parse gamedef.json: %s\n", ::cJSON_GetErrorPtr());
+        goto cleanup;
     } else {
         Logging.Log("Successfully parsed gamedef.json\n");
-        config = JsonWrapper(inner, true);
-        config.print();     
-    }    
+    }
+
+    free((void*)contents);
+
+    rc = skyline::utils::readEntireFile(romMount + "system/patchdef.json", (void**)(&contents), &contentsSize);
+    
+    if (R_FAILED(rc)) {
+        Logging.Log("Failed to load patchdef.json: 0x%x\n", rc);
+        goto exit;
+    }
+
+    Logging.Log("Successfully loaded patchdef.json: size(%d)\n", contentsSize);
+
+    parseResult = cJSON_ParseWithLength(contents, contentsSize);
+    if (parseResult == NULL) {
+        Logging.Log("Failed to parse patchdef.json: %s\n", ::cJSON_GetErrorPtr());
+        goto exit;
+    }
+
+    result = ::cJSON_AddItemToObject(inner, "patchdef", parseResult);
+    if (!result || inner == NULL) {
+        Logging.Log("Failed to parse patchdef.json: %s\n", ::cJSON_GetErrorPtr());
+    } else {
+        Logging.Log("Successfully parsed patchdef.json\n");
+    }
+
+exit:
+    config = JsonWrapper(inner, true);
+cleanup:
     free((void*)contents);
-    Logging.Log("Freed contents\n");
 }
 
 template int JsonWrapper::get<int>();
 template size_t JsonWrapper::get<size_t>();
 template char *JsonWrapper::get<char*>();
 template std::vector<char*> JsonWrapper::get<std::vector<char*>>();
+template bool JsonWrapper::get<bool>();
 
 }  // namespace config
 }  // namespace rd

src/RegionalDialect/Config.h

@@ -2,9 +2,8 @@
 
 #include <string>
 
-#include "cJSON/cJSON.h"
-
-#include "lib/log/logger_mgr.hpp"
+#include <cJSON/cJSON.h>
+#include <lib/log/logger_mgr.hpp>
 
 namespace rd {
 namespace config {

src/RegionalDialect/Hook.cpp

@@ -3,12 +3,12 @@
 #include <string>
 #include <sstream>
 
-#include "log/logger_mgr.hpp"
-#include "skyline/utils/cpputils.hpp"
+#include <log/logger_mgr.hpp>
+#include <skyline/utils/cpputils.hpp>
 
-#include "RegionalDialect/Utils.h"
-#include "RegionalDialect/Hook.h"
-#include "RegionalDialect/Config.h"
+#include "Mem.h"
+#include "Hook.h"
+#include "Config.h"
 
 enum SigExprTokenType {
     Start,
@@ -99,7 +99,7 @@ class SigExprParser {
 
                 if (token.type == Comma && allowComma) {
                     ptrdiff_t offset = expression(false);
-                    result = rd::utils::AssemblePointer(result, offset);
+                    result = rd::mem::AssemblePointer(result, offset);
                     token = lexer.getToken();
                     lexer.nextToken();
                 } 

src/RegionalDialect/Hook.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include <lib.hpp>
+#include <lib/hook/trampoline.hpp>
+
 #include "Config.h"
-#include "lib.hpp"
-#include "lib/hook/trampoline.hpp"
 
 #define DECLARE_HOOK(name, ret, ...)                                            \
     HOOK_DEFINE_TRAMPOLINE(name) { static ret Callback(__VA_ARGS__); };

src/RegionalDialect/Utils.cpp src/RegionalDialect/Mem.cppsrc/RegionalDialect/Utils.cpp renamed to src/RegionalDialect/Mem.cpp

@@ -1,14 +1,18 @@
-#include "log/logger_mgr.hpp"
+#include <log/logger_mgr.hpp>
 
-#include "RegionalDialect/Utils.h"
+#include "Mem.h"
 
 extern uintptr_t codeCaves;
 
 namespace rd {
-namespace utils {
+namespace mem {
 
 void Trampoline(uintptr_t address, uintptr_t target, reg::Register reg) {    
     if ((address & 3) || (target & 3) || reg.Index() > 31) ::abort();
+
+    if (address == 0) { Logging.Log("Invalid address. Skipping."); return; }
+    if (target == 0) { Logging.Log("Invalid target. Skipping."); return; }
+
     Overwrite(address,          inst::BranchLink(codeCaves - address).Value());
     Overwrite(codeCaves + 0,    inst::LdrLiteral(reg, 0x8).Value());
     Overwrite(codeCaves + 4,    inst::BranchRegister(reg).Value());
@@ -32,5 +36,5 @@ uintptr_t AssemblePointer(uintptr_t adrp_addr, ptrdiff_t ldr_offset) {
     return pageAddr + offsetFromPageStart;
 }
 
-}  // namespace utils
+}  // namespace mem
 }  // namespace rd

src/RegionalDialect/Utils.h src/RegionalDialect/Mem.hsrc/RegionalDialect/Utils.h renamed to src/RegionalDialect/Mem.h

@@ -3,14 +3,14 @@
 #include <cstdint>
 #include <cstring>
 
-#include "lib/armv8.hpp"
-#include "util/sys/rw_pages.hpp"
+#include <lib/armv8.hpp>
+#include <util/sys/rw_pages.hpp>
 
 namespace inst = exl::armv8::inst;
 namespace reg = exl::armv8::reg;
 
 namespace rd {
-namespace utils {
+namespace mem {
 
 template <typename T>
 inline void Overwrite(uintptr_t address, const T &value) {
@@ -24,5 +24,5 @@ void Trampoline(uintptr_t address, uintptr_t target, reg::Register reg);
 
 uintptr_t AssemblePointer(uintptr_t adrp_addr, ptrdiff_t ldr_offset);
 
-}  // namespace utils
+}  // namespace mem
 }  // namespace rd

src/RegionalDialect/System.cpp

@@ -1,7 +1,5 @@
-#include "RegionalDialect/Utils.h"
-
-#define SYSTEM_IMPLEMENTATION
-#include "RegionalDialect/System.h"
+#include "System.h"
+#include "Mem.h"
 
 namespace rd {
 namespace sys {
@@ -118,7 +116,9 @@ void OptionMain::Callback(void) {
     }
 }
 
-
+bool ChkViewDic::Callback(uint param_1, uint param_2) {
+    return Orig(param_1, param_2);
+}
 
 void Init() {
     ScrWork = (int32_t*)rd::hook::SigScan("game", "ScrWork");
@@ -140,35 +140,42 @@ void Init() {
         uintptr_t audioLoweringAddr = rd::hook::SigScan("game", "audioLoweringAddr");
         uint32_t nop = inst::Nop().Value();
 
-        rd::utils::Overwrite(audioLoweringAddr,     nop);
-        rd::utils::Overwrite(audioLoweringAddr + 4, nop);
+        rd::mem::Overwrite(audioLoweringAddr,     nop);
+        rd::mem::Overwrite(audioLoweringAddr + 4, nop);
     }
 
-    if (rd::config::config["gamedef"]["signatures"]["game"].has("OPTmenuMaxCur")) {
-        uint8_t *OPTmenuMaxCur = (uint8_t*)rd::hook::SigScan("game", "OPTmenuMaxCur");
-        OPTmenuMaxCur[4] = 4;
-    }
 
     if (rd::config::config["gamedef"]["signatures"]["game"].has("SkipModeFix"))
-        rd::utils::Overwrite(rd::hook::SigScan("game", "SkipModeFix"), inst::Branch(-284).Value());
+        rd::mem::Overwrite(rd::hook::SigScan("game", "SkipModeFix"), inst::Branch(-284).Value());
 
     if (rd::config::config["gamedef"]["signatures"]["game"].has("DoZSelection1"))
-        rd::utils::Overwrite(rd::hook::SigScan("game", "DoZSelection1"), inst::Branch(-796).Value());
+        rd::mem::Overwrite(rd::hook::SigScan("game", "DoZSelection1"), inst::Branch(-796).Value());
 
     if (rd::config::config["gamedef"]["signatures"]["game"].has("DoZSelection2"))
-        rd::utils::Overwrite(rd::hook::SigScan("game", "DoZSelection2"), inst::Branch(-320).Value());
+        rd::mem::Overwrite(rd::hook::SigScan("game", "DoZSelection2"), inst::Branch(-320).Value());
 
     if (rd::config::config["gamedef"]["signatures"]["game"].has("ShortcutMenuFix"))
-        rd::utils::Overwrite(rd::hook::SigScan("game", "ShorcutMenuFix"), inst::Movz(reg::W0, 0x370).Value());
+        rd::mem::Overwrite(rd::hook::SigScan("game", "ShorcutMenuFix"), inst::Movz(reg::W0, 0x370).Value());
 
     HOOK_FUNC(game, GSLflatRectF);
     HOOK_FUNC(game, SetFlag);
     HOOK_FUNC(game, GetFlag);
-    HOOK_FUNC(game, SpeakerDrawingFunction);
-    HOOK_FUNC(game, OptionDispChip2);
+
+    if (rd::config::config["patchdef"]["base"]["addNametags"].get<bool>()) {
+     
+        if (rd::config::config["gamedef"]["signatures"]["game"].has("OPTmenuMaxCur")) {
+            uint8_t *OPTmenuMaxCur = (uint8_t*)rd::hook::SigScan("game", "OPTmenuMaxCur");
+            OPTmenuMaxCur[4] = 4;
+        }
+
+        HOOK_FUNC(game, SpeakerDrawingFunction);
+        HOOK_FUNC(game, OptionDispChip2);
+        HOOK_FUNC(game, OptionMain);
+    }
+
     HOOK_FUNC(game, SSEvolume);
-    HOOK_FUNC(game, OptionMain);
     HOOK_FUNC(game, SSEplay);
+    HOOK_FUNC(game, ChkViewDic);
 }
 
 }  // namespace sys

src/RegionalDialect/System.h

@@ -5,29 +5,6 @@
 namespace rd {
 namespace sys {
 
-#pragma pack(4)
-struct ScriptThreadState {
-  /* 0000 */ int accumulator;
-  /* 0004 */ char gap4[16];
-  /* 0014 */ unsigned int thread_group_id;
-  /* 0018 */ unsigned int sleep_timeout;
-  /* 001C */ char gap28[8];
-  /* 0024 */ unsigned int loop_counter;
-  /* 0028 */ unsigned int loop_target_label_id;
-  /* 002C */ unsigned int call_stack_depth;
-  /* 0030 */ unsigned int ret_address_ids[8];
-  /* 0050 */ unsigned int ret_address_script_buffer_ids[8];
-  /* 0070 */ int thread_id;
-  /* 0074 */ int script_buffer_id;
-  /* 0078 */ char gap120[68];
-  /* 00BC */ int thread_local_variables[32];
-  /* 013C */ int somePageNumber;
-  /* 0140 */ ScriptThreadState *next_context;
-  /* 0144 */ ScriptThreadState *prev_context;
-  /* 0148 */ ScriptThreadState *next_free_context;
-  /* 014C */ void *pc;
-};
-
 inline int32_t *ScrWork = nullptr;
 inline uint32_t *OPTmenuModePtr = nullptr;
 inline uint8_t *OPTmenuCur = nullptr;
@@ -58,6 +35,8 @@ DECLARE_HOOK(SSEvolume, void, uint param_1);
 
 DECLARE_HOOK(SSEplay, void, int param_1, int param_2);
 
+DECLARE_HOOK(ChkViewDic, bool, uint param_1, uint param_2);
+
 void Init();
 
 }  // namespace sys