refactor exl patching (#4)

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Michael
+Copyright (c) 2024 Michael
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,6 +4,9 @@
 
 Megaton is a build tool and support library for embedding Rust in a NSO binary. [(name reference)](https://www.zeldadungeon.net/wiki/Rusty_Switch)
 
+## LICENSE
+libmegaton is GPLv2. Everything else is MIT.
+
 ## Install
 TODO
 

lib/build/configure.rs

@@ -98,7 +98,7 @@ fn build_ninja(cli: &Cli) -> Result<(), Error> {
     let includes = [&inc_root, &env.libnx_include];
 
     // let mut c_flags = flags::DEFAULT_C.to_vec();
-    let mut c_flags = vec!["-Wall", "-Werror", "-O3"];
+    let mut c_flags = vec!["-Wall", "-Werror", "-O3", "-fdiagnostics-color=always"];
     c_flags.push("-DMEGATON_LIB");
 
     let include_flag = includes

lib/include/exl/hook/inline.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include <megaton/prelude.h>
+#include <megaton/module_layout.h>
 
 #include <exl/hook/lib.hpp>
 #include <exl/hook/macros.h>
@@ -17,7 +17,7 @@ template <typename Derived> struct InlineHook {
     inline_always_ void InstallAtOffset(ptrdiff_t address) {
         _HOOK_STATIC_CALLBACK_ASSERT();
 
-        hook::HookInline(util::modules::GetTargetStart() + address,
+        hook::HookInline(megaton::module::main_info().start() + address,
                          Derived::Callback);
     }
 

lib/include/exl/hook/lib.hpp

@@ -6,7 +6,6 @@
 #include <exl/hook/nx64/impl.hpp>
 #include <exl/hook/nx64/inline_impl.hpp>
 #include <exl/hook/util/func_ptrs.hpp>
-#include <exl/hook/util/modules.hpp>
 
 namespace exl::hook {
 
@@ -17,13 +16,6 @@ namespace {
 using Entrypoint = util::GenericFuncPtr<void, void*, void*>;
 };
 
-/* inline noreturn_ CallTargetEntrypoint(void* x0, void* x1) { */
-/*     auto entrypoint =
- * reinterpret_cast<Entrypoint>(util::modules::GetTargetStart()); */
-/*     entrypoint(x0, x1); */
-/*     __builtin_unreachable(); */
-/* } */
-
 inline void Initialize() {
     arch::Initialize();
     arch::InitializeInline();

lib/include/exl/hook/replace.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include <megaton/prelude.h>
+#include <megaton/module_layout.h>
 
 #include <exl/hook/lib.hpp>
 #include <exl/hook/macros.h>
@@ -18,7 +18,7 @@ template <typename Derived> struct ReplaceHook {
     inline_always_ void InstallAtOffset(ptrdiff_t address) {
         _HOOK_STATIC_CALLBACK_ASSERT();
 
-        hook::Hook(util::modules::GetTargetStart() + address,
+        hook::Hook(megaton::module::main_info().start() + address,
                    Derived::Callback);
     }
 

lib/include/exl/hook/trampoline.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <megaton/module_layout.h>
 #include <megaton/prelude.h>
 
 #include <exl/hook/lib.hpp>
@@ -34,7 +35,7 @@ template <typename Derived> class TrampolineHook {
     inline_always_ void InstallAtOffset(ptrdiff_t address) {
         _HOOK_STATIC_CALLBACK_ASSERT();
 
-        OrigRef() = hook::Hook(util::modules::GetTargetStart() + address,
+        OrigRef() = hook::Hook(megaton::module::main_info().start() + address,
                                Derived::Callback, true);
     }