Disable alias attribute on macOS clang. (#19)

XenonRecomp/CMakeLists.txt

@@ -19,6 +19,11 @@ target_link_libraries(XenonRecomp PRIVATE
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     target_compile_options(XenonRecomp PRIVATE -Wno-switch -Wno-unused-variable -Wno-null-arithmetic)
+
+    # alias attribute not supported on Apple.
+    if (NOT APPLE)
+        target_compile_definitions(XenonRecomp PRIVATE XENON_RECOMP_USE_ALIAS)
+    endif()
 endif()
 
 target_compile_definitions(XenonRecomp PRIVATE _CRT_SECURE_NO_WARNINGS)

XenonRecomp/recompiler.cpp

@@ -98,51 +98,75 @@ void Recompiler::Analyse()
     for (size_t i = 14; i < 128; i++)
     {
         if (i < 32)
+        {
+            if (config.restGpr14Address != 0)
             {
                 auto& restgpr = functions.emplace_back();
                 restgpr.base = config.restGpr14Address + (i - 14) * 4;
                 restgpr.size = (32 - i) * 4 + 12;
                 image.symbols.emplace(Symbol{ fmt::format("__restgprlr_{}", i), restgpr.base, restgpr.size, Symbol_Function });
+            }
 
+            if (config.saveGpr14Address != 0)
+            {
                 auto& savegpr = functions.emplace_back();
                 savegpr.base = config.saveGpr14Address + (i - 14) * 4;
                 savegpr.size = (32 - i) * 4 + 8;
                 image.symbols.emplace(fmt::format("__savegprlr_{}", i), savegpr.base, savegpr.size, Symbol_Function);
+            }
 
+            if (config.restFpr14Address != 0)
+            {
                 auto& restfpr = functions.emplace_back();
                 restfpr.base = config.restFpr14Address + (i - 14) * 4;
                 restfpr.size = (32 - i) * 4 + 4;
                 image.symbols.emplace(fmt::format("__restfpr_{}", i), restfpr.base, restfpr.size, Symbol_Function);
+            }
 
+            if (config.saveFpr14Address != 0)
+            {
                 auto& savefpr = functions.emplace_back();
                 savefpr.base = config.saveFpr14Address + (i - 14) * 4;
                 savefpr.size = (32 - i) * 4 + 4;
                 image.symbols.emplace(fmt::format("__savefpr_{}", i), savefpr.base, savefpr.size, Symbol_Function);
+            }
 
+            if (config.restVmx14Address != 0)
+            {
                 auto& restvmx = functions.emplace_back();
                 restvmx.base = config.restVmx14Address + (i - 14) * 8;
                 restvmx.size = (32 - i) * 8 + 4;
                 image.symbols.emplace(fmt::format("__restvmx_{}", i), restvmx.base, restvmx.size, Symbol_Function);
+            }
 
+            if (config.saveVmx14Address != 0)
+            {
                 auto& savevmx = functions.emplace_back();
                 savevmx.base = config.saveVmx14Address + (i - 14) * 8;
                 savevmx.size = (32 - i) * 8 + 4;
                 image.symbols.emplace(fmt::format("__savevmx_{}", i), savevmx.base, savevmx.size, Symbol_Function);
             }
+        }
 
         if (i >= 64)
+        {
+            if (config.restVmx64Address != 0)
             {
                 auto& restvmx = functions.emplace_back();
                 restvmx.base = config.restVmx64Address + (i - 64) * 8;
                 restvmx.size = (128 - i) * 8 + 4;
                 image.symbols.emplace(fmt::format("__restvmx_{}", i), restvmx.base, restvmx.size, Symbol_Function);
+            }
 
+            if (config.saveVmx64Address != 0)
+            {
                 auto& savevmx = functions.emplace_back();
                 savevmx.base = config.saveVmx64Address + (i - 64) * 8;
                 savevmx.size = (128 - i) * 8 + 4;
                 image.symbols.emplace(fmt::format("__savevmx_{}", i), savevmx.base, savevmx.size, Symbol_Function);
             }
         }
+    }
 
     for (auto& [address, size] : config.functions)
     {
@@ -2334,7 +2358,10 @@ bool Recompiler::Recompile(const Function& fn)
         name = fmt::format("sub_{}", fn.base);
     }
 
+#ifdef XENON_RECOMP_USE_ALIAS
     println("__attribute__((alias(\"__imp__{}\"))) PPC_WEAK_FUNC({});", name, name);
+#endif
+
     println("PPC_FUNC_IMPL(__imp__{}) {{", name);
     println("\tPPC_FUNC_PROLOGUE();");
 
@@ -2395,6 +2422,12 @@ bool Recompiler::Recompile(const Function& fn)
 
     println("}}\n");
 
+#ifndef XENON_RECOMP_USE_ALIAS
+    println("PPC_WEAK_FUNC({}) {{", name);
+    println("\t__imp__{}(ctx, base);", name);
+    println("}}\n");
+#endif
+
     std::swap(out, tempString);
     if (localVariables.ctr)
         println("\tPPCRegister ctr{{}};");   

XenonRecomp/recompiler_config.cpp

@@ -38,6 +38,15 @@ void RecompilerConfig::Load(const std::string_view& configFilePath)
         longJmpAddress = main["longjmp_address"].value_or(0u);
         setJmpAddress = main["setjmp_address"].value_or(0u);
 
+        if (restGpr14Address == 0) fmt::println("ERROR: __restgprlr_14 address is unspecified");
+        if (saveGpr14Address == 0) fmt::println("ERROR: __savegprlr_14 address is unspecified");
+        if (restFpr14Address == 0) fmt::println("ERROR: __restfpr_14 address is unspecified");
+        if (saveFpr14Address == 0) fmt::println("ERROR: __savefpr_14 address is unspecified");
+        if (restVmx14Address == 0) fmt::println("ERROR: __restvmx_14 address is unspecified");
+        if (saveVmx14Address == 0) fmt::println("ERROR: __savevmx_14 address is unspecified");
+        if (restVmx64Address == 0) fmt::println("ERROR: __restvmx_64 address is unspecified");
+        if (saveVmx64Address == 0) fmt::println("ERROR: __savevmx_64 address is unspecified");
+
         if (auto functionsArray = main["functions"].as_array())
         {
             for (auto& func : *functionsArray)