fix: isolate static host math symbols

Author: Cycl0o0

CHANGELOG.md

@@ -39,7 +39,8 @@ patch release must remain ABI-compatible with its minor line.
 - The selected decompilation configuration and default 60 ms simulation step
   now match the exercised PAL 1.1 ROM.
 - Internal libultra compatibility functions now use liboot-prefixed symbols,
-  preventing collisions when a static host supplies the same N64 functions.
+  preventing collisions when a static host supplies the same N64 functions,
+  including the incompatible `sins` and `coss` helpers used by SM64 ports.
 - Public documentation now describes liboot as a host-driven Link runtime and
   separates current capabilities from host responsibilities and limitations.
 

CMakeLists.txt

@@ -95,6 +95,11 @@ target_compile_definitions(oot PRIVATE
     osSendMesg=liboot_internal_osSendMesg
     osRecvMesg=liboot_internal_osRecvMesg
     guPerspective=liboot_internal_guPerspective
+    guMtxF2L=liboot_internal_guMtxF2L
+    guMtxIdent=liboot_internal_guMtxIdent
+    guMtxIdentF=liboot_internal_guMtxIdentF
+    sins=liboot_internal_sins
+    coss=liboot_internal_coss
 )
 if(BUILD_SHARED_LIBS)
     target_compile_definitions(oot PRIVATE LIBOOT_MULTI_INSTANCE=1)
@@ -214,8 +219,8 @@ if(BUILD_TESTING)
 
     if(NOT BUILD_SHARED_LIBS)
         # Static game ports often carry their own libultra compatibility
-        # layer. This executable deliberately owns the four names that have
-        # collided in real hosts and must still link the complete engine.
+        # layer. This executable deliberately owns names that have collided
+        # in real hosts and must still link the complete engine.
         add_executable(liboot_static_namespace_test
             test/static_namespace_test.c
         )

Makefile

@@ -9,7 +9,12 @@ OOT_DEFINES := -DLIBOOT_HOST_BUILD=1 -D_LANGUAGE_C -DNON_MATCHING -DAVOID_UB -DD
                -DosCreateMesgQueue=liboot_internal_osCreateMesgQueue \
                -DosSendMesg=liboot_internal_osSendMesg \
                -DosRecvMesg=liboot_internal_osRecvMesg \
-               -DguPerspective=liboot_internal_guPerspective
+               -DguPerspective=liboot_internal_guPerspective \
+               -DguMtxF2L=liboot_internal_guMtxF2L \
+               -DguMtxIdent=liboot_internal_guMtxIdent \
+               -DguMtxIdentF=liboot_internal_guMtxIdentF \
+               -Dsins=liboot_internal_sins \
+               -Dcoss=liboot_internal_coss
 CFLAGS  := -g -Wall -Wno-unused-function -Wno-unused-variable \
            -fno-strict-aliasing -funsigned-char -fPIC -fvisibility=hidden \
            -DOOT_LIB_EXPORT -DLIBOOT_MULTI_INSTANCE=1 $(OOT_DEFINES) \

test/static_namespace_test.c

@@ -26,7 +26,45 @@ void guPerspective(void)
 {
 }
 
+void guMtxF2L(void)
+{
+}
+
+void guMtxIdent(void)
+{
+}
+
+void guMtxIdentF(void)
+{
+}
+
+/* SM64 ports expose these names with floating-point return values. OoT's
+ * libultra functions return signed fixed-point values, so accidentally
+ * resolving either call to the host is an ABI mismatch, not just a duplicate
+ * implementation. */
+float sins(int16_t angle)
+{
+    (void)angle;
+    return -0.25f;
+}
+
+float coss(int16_t angle)
+{
+    (void)angle;
+    return -0.5f;
+}
+
+int16_t liboot_internal_sins(uint16_t angle);
+int16_t liboot_internal_coss(uint16_t angle);
+
 int main(void)
 {
-    return oot_engine_api_version() == OOT_ENGINE_API_VERSION ? 0 : 1;
+    if (oot_engine_api_version() != OOT_ENGINE_API_VERSION) {
+        return 1;
+    }
+    if (liboot_internal_sins(0x4000u) < 32760 ||
+        liboot_internal_coss(0u) < 32760) {
+        return 2;
+    }
+    return 0;
 }