diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index 3ca0497923..65b2639c8d 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -4787,105 +4787,105 @@ PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt. PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c: .text start:0x80629B50 end:0x80629BF4 -TRK_Hollywood_Revolution/metrotrk/targsupp.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s: .text start:0x80629BF4 end:0x80629C14 -TRK_Hollywood_Revolution/metrotrk/custconn/cc_gdev.c: +TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c: .text start:0x80629C14 end:0x80629E8C .sbss start:0x8074D6D8 end:0x8074D6E0 .bss start:0x8080E8A8 end:0x8080EDC8 -TRK_Hollywood_Revolution/metrotrk/custconn/MWCriticalSection_gc.c: +TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c: .text start:0x80629E8C end:0x80629EC8 -TRK_Hollywood_Revolution/metrotrk/custconn/CircleBuffer.c: +TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c: .text start:0x80629EC8 end:0x8062A104 -TRK_Hollywood_Revolution/metrotrk/flush_cache.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c: .text start:0x8062A104 end:0x8062A13C -TRK_Hollywood_Revolution/metrotrk/main_TRK.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c: .text start:0x8062A13C end:0x8062A178 .sbss start:0x8074D6E0 end:0x8074D6E8 -TRK_Hollywood_Revolution/metrotrk/mainloop.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c: .text start:0x8062A178 end:0x8062A264 -TRK_Hollywood_Revolution/metrotrk/mem_TRK.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c: .text start:0x8062A264 end:0x8062A4C8 -TRK_Hollywood_Revolution/metrotrk/dispatch.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c: .text start:0x8062A4C8 end:0x8062A5E8 .data start:0x8073EE40 end:0x8073EEB0 -TRK_Hollywood_Revolution/metrotrk/dolphin_trk.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c: .text start:0x8062A5E8 end:0x8062A90C .data start:0x8073EEB0 end:0x8073EEF0 .sbss start:0x8074D6E8 end:0x8074D6F4 -TRK_Hollywood_Revolution/metrotrk/dolphin_trk_glue.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c: .text start:0x8062A90C end:0x8062ACA8 .data start:0x8073EEF0 end:0x8073EFD8 .sbss start:0x8074D6F4 end:0x8074D6F8 .sdata2 start:0x80753480 end:0x80753484 .bss start:0x8080EDC8 end:0x8080EDF0 -TRK_Hollywood_Revolution/metrotrk/notify.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c: .text start:0x8062ACA8 end:0x8062AD38 -TRK_Hollywood_Revolution/metrotrk/nubevent.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c: .text start:0x8062AD38 end:0x8062AED4 .data start:0x8073EFD8 end:0x8073EFF8 .bss start:0x8080EDF0 end:0x8080EE18 -TRK_Hollywood_Revolution/metrotrk/nubinit.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c: .text start:0x8062AED4 end:0x8062B024 .data start:0x8073EFF8 end:0x8073F018 .sbss start:0x8074D6F8 end:0x8074D700 -TRK_Hollywood_Revolution/metrotrk/serpoll.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c: .text start:0x8062B024 end:0x8062B16C .sbss start:0x8074D700 end:0x8074D708 -TRK_Hollywood_Revolution/metrotrk/string_TRK.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c: .text start:0x8062B16C end:0x8062B188 -TRK_Hollywood_Revolution/metrotrk/support.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c: .text start:0x8062B188 end:0x8062B7AC .data start:0x8073F018 end:0x8073F060 -TRK_Hollywood_Revolution/metrotrk/targcont.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c: .text start:0x8062B7AC end:0x8062B7E0 -TRK_Hollywood_Revolution/metrotrk/mpc_7xx_603e.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c: .text start:0x8062B7E0 end:0x8062BB08 -TRK_Hollywood_Revolution/metrotrk/msg.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c: .text start:0x8062BB08 end:0x8062BB6C .data start:0x8073F060 end:0x8073F088 .sbss start:0x8074D708 end:0x8074D710 -TRK_Hollywood_Revolution/metrotrk/msgbuf.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c: .text start:0x8062BB6C end:0x8062C378 .data start:0x8073F088 end:0x8073F0B0 .bss start:0x8080EE18 end:0x808107C0 -TRK_Hollywood_Revolution/metrotrk/msghndlr.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c: .text start:0x8062C378 end:0x8062D2FC .data start:0x8073F0B0 end:0x8073F118 .sbss start:0x8074D710 end:0x8074D718 -TRK_Hollywood_Revolution/metrotrk/mslsupp.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c: .text start:0x8062D2FC end:0x8062D488 -TRK_Hollywood_Revolution/metrotrk/targimpl.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c: .text start:0x8062D488 end:0x8062ECAC .rodata start:0x8065FF00 end:0x8065FF88 .data start:0x8073F118 end:0x8073F128 .sbss start:0x8074D718 end:0x8074D728 .bss start:0x808107C0 end:0x80810D68 -TRK_Hollywood_Revolution/metrotrk/target_options.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c: .text start:0x8062ECAC end:0x8062ECBC NdevExi2AD/DebuggerDriver.c: diff --git a/configure.py b/configure.py index d775928b80..e97f5cc659 100755 --- a/configure.py +++ b/configure.py @@ -239,16 +239,19 @@ cflags_base = [ "-fp hardware", "-Cpp_exceptions off", # "-W all", + "-O4,p", + "-inline auto", '-pragma "cats off"', '-pragma "warn_notinlined off"', "-maxerrors 1", "-nosyspath", + "-RTTI off", "-fp_contract on", + "-str reuse", "-i include", f"-i build/{config.version}/include", f"-i assets/{config.version}", "-i src", - "-ir src/dolphin", "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", "-i src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", @@ -260,15 +263,10 @@ cflags_base = [ "-D__GEKKO__", ] -if config.version == "ShieldD": - cflags_base.extend(["-O0", "-inline off", "-RTTI on", "-str reuse", "-enc SJIS", "-DDEBUG=1", "-DWIDESCREEN_SUPPORT=1"]) -elif config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]: - cflags_base.extend(["-O4,p", "-inline auto", "-ipa file", "-RTTI on", "-str reuse", "-enc SJIS", "-DWIDESCREEN_SUPPORT=1"]) +if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield", "ShieldD"]: + cflags_base.extend(["-enc SJIS"]) else: - cflags_base.extend(["-O4,p", "-inline auto", "-RTTI off", "-str reuse", "-multibyte"]) - -if config.version in ["RZDE01_00", "ShieldD"] or args.debug or args.reghio: - cflags_base.extend(["-DENABLE_REGHIO=1"]) + cflags_base.extend(["-multibyte"]) USE_REVOLUTION_SDK_VERSIONS = [ "RZDE01_00", # Wii USA Rev 0 @@ -290,6 +288,8 @@ if config.version in USE_REVOLUTION_SDK_VERSIONS: if args.debug: # Or -sym dwarf-2 for Wii compilers cflags_base.extend(["-sym on", "-DDEBUG=1", "-DDEBUG_DEFINED=1", "-DNDEBUG_DEFINED=0"]) +elif config.version == "ShieldD": + cflags_base.extend(["-DDEBUG=1", "-DDEBUG_DEFINED=1", "-DNDEBUG_DEFINED=0"]) else: cflags_base.extend(["-DNDEBUG=1", "-DNDEBUG_DEFINED=1", "-DDEBUG_DEFINED=0"]) @@ -301,11 +301,6 @@ elif args.warn == "off": elif args.warn == "error": cflags_base.append("-W error") -cflags_noopt = cflags_base[:] - -if config.version != "ShieldD": - cflags_noopt.remove("-O4,p") - # Metrowerks library flags cflags_runtime = [ *cflags_base, @@ -313,9 +308,10 @@ cflags_runtime = [ "-str reuse,pool,readonly", "-common off", "-char signed", + # "-inline deferred,auto" ] -if config.version != "ShieldD": +if config.version not in ["ShieldD", "Shield"]: cflags_runtime.extend(["-inline deferred,auto"]) cflags_trk = [ @@ -333,81 +329,35 @@ cflags_trk = [ # Dolphin library flags cflags_dolphin = [ - "-nodefaults", - "-proc gekko", - "-align powerpc", - "-enum int", - "-fp hardware", - "-Cpp_exceptions off", - '-pragma "cats off"', - '-pragma "warn_notinlined off"', - "-maxerrors 1", - "-nosyspath", - "-char unsigned", - "-O4,p", - "-sym on", - "-inline auto", - "-i include", - f"-i build/{config.version}/include", + *cflags_base, "-ir src/dolphin", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/Runtime/Inc", - "-i src/PowerPC_EABI_Support/MetroTRK", - "-i include/dolphin", - f"-DVERSION={version_num}", - "-D__GEKKO__", + "-fp_contract off", + "-char unsigned", + "-sym on", "-DSDK_REVISION=2", ] # Revolution library flags cflags_revolution_base = [ - "-nodefaults", - "-proc gekko", - "-align powerpc", - "-enum int", - "-fp hardware", - "-Cpp_exceptions off", - '-pragma "cats off"', - '-pragma "warn_notinlined off"', - "-maxerrors 1", - "-nosyspath", - #"-char unsigned", + *cflags_base, + "-ir src/revolution", + "-fp_contract off", "-sym on", "-inline auto", "-ipa file", - "-i include", - f"-i build/{config.version}/include", - "-ir src/revolution", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/Runtime/Inc", - "-i src/PowerPC_EABI_Support/MetroTRK", "-i include/revolution", - f"-DVERSION={version_num}", - "-D__GEKKO__", "-D__REVOLUTION_SDK__", ] cflags_revolution_retail = [ *cflags_revolution_base, "-O4,p", - "-DNDEBUG=1", - "-DNDEBUG_DEFINED=1", - "-DDEBUG_DEFINED=0", ] cflags_revolution_debug = [ *cflags_revolution_base, "-opt off", "-inline off", - "-DDEBUG=1", - "-DDEBUG_DEFINED=1", - "-DNDEBUG_DEFINED=0", ] # Framework flags @@ -419,6 +369,20 @@ cflags_framework = [ "-fp_contract off", ] +# for specific sdk libs +cflags_noopt = cflags_base[:] +if config.version != "ShieldD": + cflags_noopt.remove("-O4,p") + + +if config.version == "ShieldD": + cflags_framework.extend(["-O0", "-inline off", "-RTTI on", "-DDEBUG=1", "-DWIDESCREEN_SUPPORT=1"]) +elif config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]: + cflags_framework.extend(["-ipa file", "-RTTI on", "-DWIDESCREEN_SUPPORT=1"]) + +if config.version in ["RZDE01_00", "ShieldD"] or args.debug or args.reghio: + cflags_framework.extend(["-DENABLE_REGHIO=1"]) + if config.version != "ShieldD": if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]: # TODO: whats the correct inlining flag? deferred looks better in some places, others not. something else wrong? @@ -429,6 +393,7 @@ if config.version != "ShieldD": if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"]: cflags_framework.extend(["-DSDK_SEP2006"]) + # REL flags cflags_rel = [ *cflags_framework, @@ -465,6 +430,7 @@ def MWVersion(cfg_version: str | None) -> str: case _: return "GC/2.7" +# Wii versions specifically need linker GC/3.0a5 if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"]: config.linker_version = "GC/3.0a5" else: @@ -597,6 +563,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "m_Do/m_Do_machine.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_mtx.cpp"), Object(Equivalent, "m_Do/m_Do_ext.cpp"), # weak func order + Object(NonMatching, "m_Do/m_Do_ext2.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_lib.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_Reset.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_dvd_thread.cpp"), @@ -633,6 +600,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_op/f_op_actor_iter.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_actor_tag.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_camera.cpp"), + Object(NonMatching, "f_op/f_op_actor_map.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_actor_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_camera_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_overlap.cpp"), @@ -740,7 +708,9 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bg_plc.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_acch.cpp"), + Object(NonMatching, "d/d_bg_s_capt_poly.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bg_s_chk.cpp"), + Object(NonMatching, "d/d_bg_s_func.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_gnd_chk.cpp"), # debug weak func order Object(MatchingFor(ALL_GCN), "d/d_bg_s_grp_pass_chk.cpp"), # debug weak func order Object(MatchingFor(ALL_GCN), "d/d_bg_s_lin_chk.cpp"), @@ -752,6 +722,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_bg_s_wtr_chk.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w_base.cpp"), + Object(NonMatching, "d/d_bg_w_deform.cpp"), + Object(NonMatching, "d/d_bg_w_hf.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w_kcol.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w_sv.cpp"), Object(Equivalent, "d/d_cc_d.cpp"), # weak func order (cCcD_ShapeAttr::GetCoCP) @@ -760,6 +732,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "d/d_cc_uty.cpp"), Object(MatchingFor(ALL_GCN), "d/d_cam_param.cpp"), Object(MatchingFor(ALL_GCN), "d/d_ev_camera.cpp"), + Object(NonMatching, "d/d_jcam_editor.cpp"), + Object(NonMatching, "d/d_jpreviewer.cpp"), Object(MatchingFor(ALL_GCN), "d/d_spline_path.cpp"), Object(MatchingFor(ALL_GCN), "d/d_item_data.cpp"), Object(MatchingFor(ALL_GCN), "d/d_item.cpp"), @@ -768,6 +742,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "d/d_eye_hl.cpp"), Object(MatchingFor(ALL_GCN), "d/d_error_msg.cpp"), Object(Equivalent, "d/d_debug_viewer.cpp"), # debug weak func order + Object(NonMatching, "d/d_debug_pad.cpp"), Object(NonMatching, "d/d_debug_camera.cpp"), Object(Equivalent, "d/actor/d_a_alink.cpp"), # weak func order, vtable order Object(MatchingFor(ALL_GCN), "d/actor/d_a_itembase.cpp"), @@ -810,6 +785,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "d/d_menu_item_explain.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_letter.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_option.cpp"), + Object(NonMatching, "d/d_menu_quit.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_ring.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_save.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_skill.cpp"), @@ -846,6 +822,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "d/d_msg_string.cpp"), Object(MatchingFor(ALL_GCN), "d/d_msg_flow.cpp"), Object(MatchingFor(ALL_GCN), "d/d_name.cpp"), + Object(NonMatching, "d/d_npc.cpp"), Object(MatchingFor(ALL_GCN), "d/d_npc_lib.cpp"), Object(MatchingFor(ALL_GCN), "d/d_ovlp_fade.cpp"), Object(MatchingFor(ALL_GCN), "d/d_ovlp_fade2.cpp"), @@ -944,8 +921,13 @@ config.libs = [ JSystemLib( "J3DU", [ + Object(NonMatching, "JSystem/J3DU/J3DUPerf.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DU/J3DUClipper.cpp"), + Object(NonMatching, "JSystem/J3DU/J3DUMotion.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "JSystem/J3DU/J3DUDL.cpp"), + Object(NonMatching, "JSystem/J3DU/J3DUFur.cpp"), + Object(NonMatching, "JSystem/J3DU/J3DUShadow.cpp"), + Object(NonMatching, "JSystem/J3DU/J3DUMtxCache.cpp"), ], ), JSystemLib( @@ -1025,6 +1007,37 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio_JParticle/object-particle.cpp"), ], ), + JSystemLib( + "JStudioCameraEditor", + [ + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/control.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/csb.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/csb-data.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/sequence.cpp"), + ], + ), + JSystemLib( + "JStudioPreviewer", + [ + Object(NonMatching, "JSystem/JStudio/JStudioPreviewer/control.cpp"), + ], + ), + JSystemLib( + "JStudioToolLibrary", + [ + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/anchor.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/console.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/controlset.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/controlset-anchor.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/controlset-preview.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/interface.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/scroll.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/visual.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/xml.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp"), + ], + ), JSystemLib( "JAudio2", [ @@ -1036,6 +1049,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASResArcLoader.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASProbe.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASReport.cpp"), + Object(NonMatching, "JSystem/JAudio2/JASWaveFile.cpp"), + Object(NonMatching, "JSystem/JAudio2/JASWaveFileWav.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASCmdStack.cpp"), Object(Equivalent, "JSystem/JAudio2/JASTrack.cpp"), # weak func order Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASTrackPort.cpp"), @@ -1044,6 +1059,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASSeqParser.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASSeqReader.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASAramStream.cpp"), + Object(NonMatching, "JSystem/JAudio2/JASMidi.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBank.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBasicBank.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JAudio2/JASVoiceBank.cpp"), @@ -1051,6 +1067,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASDrumSet.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBasicWaveBank.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASSimpleWaveBank.cpp"), + Object(NonMatching, "JSystem/JAudio2/JASInstRand.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASWSParser.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBNKParser.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASWaveArcLoader.cpp"), @@ -1084,6 +1101,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAIStream.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAIStreamDataMgr.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAIStreamMgr.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUAudience.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUAudioArcInterpreter.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUAudioArcLoader.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUAudioMgr.cpp"), @@ -1094,8 +1112,12 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSeqCollection.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSeqDataBlockMgr.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSoundAnimator.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUSoundMgr.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUSoundObject.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSoundTable.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUStdSoundInfo.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUStreamFileTable.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUWaveFilePlayer.cpp"), ], ), JSystemLib( @@ -1109,24 +1131,62 @@ config.libs = [ ], ), JSystemLib( - "JAHostIO", + "JAWWinLib", [ - Object(Matching, "JSystem/JAHostIO/JAHioMessage.cpp"), - Object(NonMatching, "JSystem/JAHostIO/JAHioMgr.cpp"), - Object(NonMatching, "JSystem/JAHostIO/JAHioNode.cpp"), - Object(NonMatching, "JSystem/JAHostIO/JAHioUtil.cpp"), - ] + Object(NonMatching, "JSystem/JAWWinLib/JAWSeqEdit.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWSoundTable.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWBankView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWHioBankEdit.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWHioReceiver.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWMidiTerm.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWSysMemView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWChView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWVolume.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWReportView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWPlayerChView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWPlaySeView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWEntrySeView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWTrackView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWSpeAna.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWSectionHeapView.cpp"), + ], ), JSystemLib( "JMessage", [ Object(MatchingFor(ALL_GCN), "JSystem/JMessage/control.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JMessage/data.cpp"), + Object(NonMatching, "JSystem/JMessage/data-parse.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JMessage/processor.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JMessage/resource.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JMessage/locale.cpp"), ], ), + JSystemLib( + "JAHostIO", + [ + Object(Matching, "JSystem/JAHostIO/JAHioMessage.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHioMgr.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHioNode.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHioUtil.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHFrameNode.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHVirtualNode.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHUAsnData.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHUTableEdit.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHUFx.cpp"), + ], + ), + JSystemLib( + "JAHNodeLib", + [ + Object(NonMatching, "JSystem/JAHNodeLib/JAHAudienceSettingNode.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHConductNode.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHIDSwapNode.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHSoundPlayerNode.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHViewerSys.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHViewerApp.cpp"), + ], + ), { "lib": "Z2AudioLib", "mw_version": MWVersion(config.version), @@ -1156,25 +1216,47 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SpeechMgr2.cpp"), Object(Equivalent, "Z2AudioLib/Z2AudioMgr.cpp"), # weak func order Object(NonMatching, "Z2AudioLib/Z2DebugSys.cpp"), + Object(NonMatching, "Z2AudioLib/Z2F1TestWindow.cpp"), Object(NonMatching, "Z2AudioLib/Z2SoundPlayer.cpp"), + Object(NonMatching, "Z2AudioLib/Z2WaveArcLoader.cpp"), + Object(NonMatching, "Z2AudioLib/Z2SeView.cpp"), + Object(NonMatching, "Z2AudioLib/Z2TrackView.cpp"), + ], + }, + { + "lib": "Z2AudioCSD", + "mw_version": MWVersion(config.version), + "cflags": cflags_framework, + "progress_category": "core", + "host": True, + "objects": [ + Object(NonMatching, "Z2AudioCSD/SpkSpeakerCtrl.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkSystem.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkMixingBuffer.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkWave.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkTable.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkData.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkSound.cpp"), + Object(NonMatching, "Z2AudioCSD/Z2AudioCS.cpp"), ], }, { "lib": "gf", "mw_version": MWVersion(config.version), - "cflags": cflags_noopt, + "cflags": [*cflags_noopt, "-O3"], "progress_category": "sdk", "objects": [ - Object(MatchingFor(ALL_GCN), "dolphin/gf/GFGeometry.cpp", extra_cflags=["-O3"]), - Object(MatchingFor(ALL_GCN), "dolphin/gf/GFLight.cpp", extra_cflags=["-O3"]), - Object(MatchingFor(ALL_GCN), "dolphin/gf/GFPixel.cpp", extra_cflags=["-O3"]), - Object(MatchingFor(ALL_GCN), "dolphin/gf/GFTev.cpp", extra_cflags=["-O3"]), + Object(MatchingFor(ALL_GCN), "dolphin/gf/GFGeometry.cpp"), + Object(MatchingFor(ALL_GCN), "dolphin/gf/GFLight.cpp"), + Object(MatchingFor(ALL_GCN), "dolphin/gf/GFPixel.cpp"), + Object(MatchingFor(ALL_GCN), "dolphin/gf/GFTev.cpp"), ], }, JSystemLib( "JKernel", [ Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRHeap.cpp"), + Object(NonMatching, "JSystem/JKernel/JKRStdHeap.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRExpHeap.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRSolidHeap.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRAssertHeap.cpp"), @@ -1196,6 +1278,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRCompArchive.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRFile.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRDvdFile.cpp"), + Object(NonMatching, "JSystem/JKernel/JKRRelocation.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRDvdRipper.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRDvdAramRipper.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRDecomp.cpp"), @@ -1214,9 +1297,18 @@ config.libs = [ JSystemLib( "JGadget", [ + Object(NonMatching, "JSystem/JGadget/define.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JGadget/binary.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JGadget/linklist.cpp"), + Object(NonMatching, "JSystem/JGadget/search.cpp"), + Object(NonMatching, "JSystem/JGadget/textreader.cpp"), + Object(NonMatching, "JSystem/JGadget/xml-scanner.cpp"), + Object(NonMatching, "JSystem/JGadget/std-list.cpp"), + Object(NonMatching, "JSystem/JGadget/std-stream.cpp"), + Object(NonMatching, "JSystem/JGadget/std-streambuf.cpp"), + Object(NonMatching, "JSystem/JGadget/std-string.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JGadget/std-vector.cpp"), + Object(NonMatching, "JSystem/JGadget/dolphin-stream-JORFile.cpp"), ], ), JSystemLib( @@ -1242,6 +1334,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTConsole.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTDirectFile.cpp"), Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), + Object(NonMatching, "JSystem/JUtility/JUTFontData_Ascfont_fix16.cpp"), ], ), JSystemLib( @@ -1263,6 +1356,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DPictureEx.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DTextBoxEx.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DAnmLoader.cpp"), + Object(NonMatching, "JSystem/J2DGraph/J2DAnmSaver.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DAnimation.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DManage.cpp"), ], @@ -1308,11 +1402,14 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DMaterialFactory.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DClusterLoader.cpp"), + Object(NonMatching, "JSystem/J3DGraphLoader/J3DBinaryFormat.cpp"), + Object(NonMatching, "JSystem/J3DGraphLoader/J3DSaverUtility.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DModelLoader.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DJointFactory.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DAnmLoader.cpp"), + Object(NonMatching, "JSystem/J3DGraphLoader/J3DModelSaver.cpp"), ], ), JSystemLib( @@ -1378,7 +1475,7 @@ config.libs = [ { "lib": "exi", "mw_version": "GC/1.2.5n", - "cflags": cflags_noopt, + "cflags": [*cflags_noopt, "-ir src/dolphin"], "progress_category": "sdk", "objects": [ Object(MatchingFor(ALL_GCN), "dolphin/exi/EXIBios.c", extra_cflags=["-O3,p"]), @@ -1796,6 +1893,7 @@ config.libs = [ "progress_category": "sdk", "host": False, "objects": [ + Object(NonMatching, "PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/Runtime/Src/__mem.c"), Object(MatchingFor(ALL_GCN, "Shield"), "PowerPC_EABI_Support/Runtime/Src/__va_arg.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c"), @@ -1820,31 +1918,41 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c"), Object(MatchingFor(ALL_GCN, "Shield"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c"), @@ -1866,8 +1974,10 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c"), @@ -1887,6 +1997,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c", extra_cflags=["-sdata 8"]), + Object(NonMatching, "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c"), @@ -1912,6 +2023,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c", extra_cflags=["-sdata 8"]), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c"), + Object(NonMatching, "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c"), ], }, @@ -1945,6 +2057,17 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "odenotstub/odenotstub.c"), ], }, + { + "lib": "NdevExi2AD", + "mw_version": MWVersion(config.version), + "cflags": cflags_dolphin, + "progress_category": "sdk", + "host": False, + "objects": [ + Object(NonMatching, "NdevExi2AD/DebuggerDriver.c"), + Object(NonMatching, "NdevExi2AD/exi2.c"), + ], + }, { "lib": "lingcod", "mw_version": MWVersion(config.version), diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index 1bb748a80d..234f1c0c29 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -2,7 +2,7 @@ #define J2DPRINT_H #include "JSystem/J2DGraph/J2DTextBox.h" -#include "__va_arg.h" +#include class JUTFont; class J2DPrint; diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 9fd352a04b..f080c91f72 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -2,7 +2,7 @@ #define JGEOMETRY_H #include "dolphin/mtx.h" -#include "math.h" +#include #include "JSystem/JMath/JMath.h" namespace JGeometry { diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index ee31b6e541..35cde38bef 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -2,7 +2,7 @@ #define JMATH_H #include "dolphin/mtx.h" -#include "math.h" +#include void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32); void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3); diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h index 73635c990e..109d17230d 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-math.h +++ b/include/JSystem/JStudio/JStudio/jstudio-math.h @@ -2,7 +2,7 @@ #define JSTUDIO_MATH_H #include "dolphin/mtx.h" -#include "math.h" +#include namespace JStudio { namespace math { diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 3f42a456b5..6bca78c4c0 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -3,8 +3,8 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "global.h" -#include "limits.h" -#include "math.h" +#include +#include typedef struct _GXColor GXColor; diff --git a/include/JSystem/JStudio/JStudio/stb.h b/include/JSystem/JStudio/JStudio/stb.h index 1b8c3d497d..d61bfda06c 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/include/JSystem/JStudio/JStudio/stb.h @@ -163,7 +163,7 @@ private: /* 0x04 */ u32 _4; /* 0x08 */ u32 _8; /* 0x0C */ TFactory* pFactory; - /* 0x10 */ JGadget::TLinkList mObjectContainer; + /* 0x10 */ JGadget::TLinkList ocObject_; /* 0x1C */ u32 mStatus; /* 0x20 */ TObject_control mObject_control; /* 0x54 */ s32 _54; diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index cb65d1091c..6f9194b837 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -4,7 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/JUTFont.h" -#include "__va_arg.h" +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index 8d85ba5982..d856510ff3 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -2,7 +2,7 @@ #define JUTDIRECTPRINT_H #include "JSystem/JUtility/TColor.h" -#include "__va_arg.h" +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 923349a089..197936ed81 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" -#include "__va_arg.h" +#include #include #include #include "global.h" diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index ed26298701..4c4d947100 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -1,7 +1,7 @@ #ifndef C_M3D_H_ #define C_M3D_H_ -#include "math.h" +#include #include "dolphin/mtx.h" class cM3dGAab; diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 976fc0faf7..bf2008cfdb 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -2,7 +2,7 @@ #define C_XYZ_H #include "dolphin/mtx.h" -#include "math.h" +#include struct cXyz : Vec { static const cXyz Zero; diff --git a/include/d/actor/d_a_obj_dust.h b/include/d/actor/d_a_obj_dust.h index 023a811d1f..8adb5133b8 100644 --- a/include/d/actor/d_a_obj_dust.h +++ b/include/d/actor/d_a_obj_dust.h @@ -11,7 +11,7 @@ #include "d/d_resorce.h" #include "d/d_s_play.h" -#include +#include /** * @ingroup actors-objects diff --git a/include/d/d_menu_dmap_map.h b/include/d/d_menu_dmap_map.h index 8c23a3b0eb..ca8b26f15e 100644 --- a/include/d/d_menu_dmap_map.h +++ b/include/d/d_menu_dmap_map.h @@ -2,7 +2,7 @@ #define D_MENU_D_MENU_DMAP_MAP_H #include "d/d_menu_dmap.h" -#include +#include class dMenu_DmapMap_c { public: diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index 22d34b855e..00fb5c3445 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -5,13 +5,13 @@ #include "weak_bss_1109_to_1009.h" // IWYU pragma: export // Fixes weak .data -#include "math.h" // IWYU pragma: export +#include "cmath.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export #include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export // Fixes weak function ordering -#include "cmath.h" // IWYU pragma: export -#include "string.h" // IWYU pragma: export +#include "math.h" // IWYU pragma: export +#include "cstring.h" // IWYU pragma: export #include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export #include "JSystem/JHostIO/JORReflexible.h" // IWYU pragma: export diff --git a/include/dolphin/ar.h b/include/dolphin/ar.h index d65a282811..0a5d781a8f 100644 --- a/include/dolphin/ar.h +++ b/include/dolphin/ar.h @@ -1,6 +1,9 @@ #ifndef _DOLPHIN_AR_H_ #define _DOLPHIN_AR_H_ +#ifdef __REVOLUTION_SDK__ +#include +#else #include #ifdef __cplusplus @@ -64,8 +67,12 @@ void ARQSetChunkSize(u32 size); u32 ARQGetChunkSize(void); BOOL ARQCheckInit(void); +u16 __ARGetInterruptStatus(void); +void __ARClearInterrupt(void); + #ifdef __cplusplus } #endif #endif +#endif diff --git a/include/dolphin/os.h b/include/dolphin/os.h index 989324d7fc..1abc59108f 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -1,7 +1,7 @@ #ifndef _DOLPHIN_OS_H_ #define _DOLPHIN_OS_H_ -#include +#include #ifdef __REVOLUTION_SDK__ #include diff --git a/include/dolphin/fake_tgmath.h b/include/dolphin/sdk_math.h similarity index 91% rename from include/dolphin/fake_tgmath.h rename to include/dolphin/sdk_math.h index 41a982106d..cb59311411 100644 --- a/include/dolphin/fake_tgmath.h +++ b/include/dolphin/sdk_math.h @@ -1,4 +1,4 @@ -#pragma cplusplus on +// fake MSL_C math for sdk specifically since it differs from game MSL_C math extern inline float sqrtf(float x) { static const double _half=.5; @@ -46,6 +46,10 @@ extern inline float fabsf(float x) { } extern float cosf(float); +extern float sinf(float); +extern float tanf(float); +extern float acosf(float); + extern inline float cos(float x) { return cosf(x); } @@ -62,5 +66,3 @@ inline float floor(float x) { // x < 0 -> int conversion of x above rounded toward zero(so decrement) return (float)i; } - -#pragma cplusplus reset diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 411bb8ec27..53ba266cbe 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -82,7 +82,7 @@ typedef unsigned int uint; #define __REGISTER #endif -#include +#include #endif #endif diff --git a/include/global.h b/include/global.h index 5176f8021e..4f2b7a60ad 100644 --- a/include/global.h +++ b/include/global.h @@ -1,8 +1,7 @@ #ifndef _global_h_ #define _global_h_ -#include "dolphin/types.h" - +// Version ordering defined in configure.py #define VERSION_GCN_USA 0 #define VERSION_GCN_PAL 1 #define VERSION_GCN_JPN 2 @@ -49,8 +48,6 @@ #define decltype __decltype__ #endif -#define JUT_EXPECT(...) - #define _SDA_BASE_(dummy) 0 #define _SDA2_BASE_(dummy) 0 diff --git a/include/revolution/aralt.h b/include/revolution/aralt.h index 8a699bb857..74d3c4751b 100644 --- a/include/revolution/aralt.h +++ b/include/revolution/aralt.h @@ -40,14 +40,29 @@ typedef struct ARQRequest ARQRequest; // AR ARQCallback ARRegisterDMACallback(ARQCallback callback); +u32 ARGetDMAStatus(void); void ARStartDMA(u32 type, u32 mainmem_addr, u32 aram_addr, u32 length); u32 ARAlloc(u32 length); +u32 ARFree(u32* length); +BOOL ARCheckInit(void); u32 ARInit(u32* stack_index_addr, u32 num_entries); +void ARReset(void); +void ARSetSize(void); u32 ARGetBaseAddress(void); u32 ARGetSize(void); +u32 ARGetInternalSize(void); +void ARClear(u32 flag); // ARQ void ARQInit(void); +void ARQReset(void); +void ARQPostRequest(ARQRequest* request, u32 owner, u32 type, u32 priority, u32 source, u32 dest, u32 length, ARQCallback callback); +void ARQRemoveRequest(ARQRequest* request); +void ARQRemoveOwnerRequest(u32 owner); +void ARQFlushQueue(void); +void ARQSetChunkSize(u32 size); +u32 ARQGetChunkSize(void); +BOOL ARQCheckInit(void); #ifdef __cplusplus } diff --git a/include/revolution/os.h b/include/revolution/os.h index 7ab36c7361..351615ee52 100644 --- a/include/revolution/os.h +++ b/include/revolution/os.h @@ -1,7 +1,7 @@ #ifndef _REVOLUTION_OS_H_ #define _REVOLUTION_OS_H_ -#include +#include #include #include diff --git a/include/revolution/private/iosrestypes.h b/include/revolution/private/iosrestypes.h index 9f7502bd1b..a8766f4083 100644 --- a/include/revolution/private/iosrestypes.h +++ b/include/revolution/private/iosrestypes.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _REVOLUTION_IOSRESTYPES_H_ +#define _REVOLUTION_IOSRESTYPES_H_ #include @@ -87,3 +88,5 @@ typedef struct { IOSResourceIoctlv ioctlv; } args; } IOSResourceRequest; + +#endif diff --git a/include/revolution/private/iostypes.h b/include/revolution/private/iostypes.h index 6c57627407..9e4d7ce048 100644 --- a/include/revolution/private/iostypes.h +++ b/include/revolution/private/iostypes.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _REVOLUTION_IOSTYPES_H_ +#define _REVOLUTION_IOSTYPES_H_ #include @@ -41,3 +42,5 @@ typedef struct { IOSCSigDummy dummy; IOSCName issuer; } IOSCSigRsa2048; + +#endif diff --git a/include/revolution/fake_tgmath.h b/include/revolution/sdk_math.h similarity index 91% rename from include/revolution/fake_tgmath.h rename to include/revolution/sdk_math.h index 41a982106d..cb59311411 100644 --- a/include/revolution/fake_tgmath.h +++ b/include/revolution/sdk_math.h @@ -1,4 +1,4 @@ -#pragma cplusplus on +// fake MSL_C math for sdk specifically since it differs from game MSL_C math extern inline float sqrtf(float x) { static const double _half=.5; @@ -46,6 +46,10 @@ extern inline float fabsf(float x) { } extern float cosf(float); +extern float sinf(float); +extern float tanf(float); +extern float acosf(float); + extern inline float cos(float x) { return cosf(x); } @@ -62,5 +66,3 @@ inline float floor(float x) { // x < 0 -> int conversion of x above rounded toward zero(so decrement) return (float)i; } - -#pragma cplusplus reset diff --git a/include/revolution/types.h b/include/revolution/types.h index fc9c6f4315..65fbba9203 100644 --- a/include/revolution/types.h +++ b/include/revolution/types.h @@ -79,6 +79,6 @@ typedef unsigned int uint; #define __REGISTER #endif -#include +#include #endif diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 1697151b55..9a70147dc0 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRFileCache.h" #include "JSystem/JUtility/JUTConsole.h" -#include "stdio.h" +#include #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp index 18281a0092..69234af65f 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/src/JSystem/J2DGraph/J2DTevs.cpp @@ -6,7 +6,7 @@ #include "JSystem/J2DGraph/J2DTevs.h" #include "JSystem/J2DGraph/J2DMatBlock.h" -#include "math.h" +#include #include "dolphin/gx.h" void J2DTexMtx::load(u32 mtxIdx) { @@ -24,15 +24,15 @@ void J2DTexMtx::calc() { void J2DTexMtx::getTextureMtx(J2DTextureSRTInfo const& param_0, Vec param_1, Mtx param_2) { float f31 = (param_0.mRotationDeg * M_PI) / 180.0f; - param_2[0][0] = param_0.mScaleX * i_cosf(f31); - param_2[0][1] = -param_0.mScaleX * i_sinf(f31); + param_2[0][0] = param_0.mScaleX * cosf(f31); + param_2[0][1] = -param_0.mScaleX * sinf(f31); param_2[0][2] = 0.0f; - param_2[0][3] = -param_0.mScaleX * i_cosf(f31) * param_1.x + param_1.y * (param_0.mScaleX * i_sinf(f31)) + + param_2[0][3] = -param_0.mScaleX * cosf(f31) * param_1.x + param_1.y * (param_0.mScaleX * sinf(f31)) + param_1.x + param_0.mTranslationX; - param_2[1][0] = param_0.mScaleY * i_sinf(f31); - param_2[1][1] = param_0.mScaleY * i_cosf(f31); + param_2[1][0] = param_0.mScaleY * sinf(f31); + param_2[1][1] = param_0.mScaleY * cosf(f31); param_2[1][2] = 0.0f; - param_2[1][3] = -param_0.mScaleY * i_sinf(f31) * param_1.x - param_1.y * (param_0.mScaleY * i_cosf(f31)) + + param_2[1][3] = -param_0.mScaleY * sinf(f31) * param_1.x - param_1.y * (param_0.mScaleY * cosf(f31)) + param_1.y + param_0.mTranslationY; param_2[2][0] = 0.0f; param_2[2][1] = 0.0f; @@ -42,16 +42,16 @@ void J2DTexMtx::getTextureMtx(J2DTextureSRTInfo const& param_0, Vec param_1, Mtx void J2DTexMtx::getTextureMtxMaya(J2DTextureSRTInfo const& param_0, Mtx param_1) { float f31 = (param_0.mRotationDeg * M_PI) / 180.0f; - param_1[0][0] = param_0.mScaleX * i_cosf(f31); - param_1[0][1] = param_0.mScaleY * i_sinf(f31); + param_1[0][0] = param_0.mScaleX * cosf(f31); + param_1[0][1] = param_0.mScaleY * sinf(f31); param_1[0][2] = 0.0f; - param_1[0][3] = (param_0.mTranslationX - 0.5f) * i_cosf(f31) - - (param_0.mTranslationY - 0.5f + param_0.mScaleY) * i_sinf(f31) + 0.5f; - param_1[1][0] = -param_0.mScaleX * i_sinf(f31); - param_1[1][1] = param_0.mScaleY * i_cosf(f31); + param_1[0][3] = (param_0.mTranslationX - 0.5f) * cosf(f31) - + (param_0.mTranslationY - 0.5f + param_0.mScaleY) * sinf(f31) + 0.5f; + param_1[1][0] = -param_0.mScaleX * sinf(f31); + param_1[1][1] = param_0.mScaleY * cosf(f31); param_1[1][2] = 0.0f; - param_1[1][3] = -(param_0.mTranslationX - 0.5f) * i_sinf(f31) - - (param_0.mTranslationY - 0.5f + param_0.mScaleY) * i_cosf(f31) + 0.5f; + param_1[1][3] = -(param_0.mTranslationX - 0.5f) * sinf(f31) - + (param_0.mTranslationY - 0.5f + param_0.mScaleY) * cosf(f31) + 0.5f; param_1[2][0] = 0.0f; param_1[2][1] = 0.0f; param_1[2][2] = 1.0f; diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp index b25841914d..04edda6427 100644 --- a/src/JSystem/J3DU/J3DUClipper.cpp +++ b/src/JSystem/J3DU/J3DUClipper.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J3DU/J3DUClipper.h" -#include "math.h" +#include void J3DUClipper::init() { mNear = 1.0f; diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp index f0983ae257..744bc69eaf 100644 --- a/src/JSystem/JAudio2/JASReport.cpp +++ b/src/JSystem/JAudio2/JASReport.cpp @@ -8,7 +8,7 @@ #include "JSystem/JAudio2/JASCalc.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRHeap.h" -#include "stdio.h" +#include static OSMutex sMutex; diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp index 9c35789833..03525f9199 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -5,7 +5,7 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" -#include "cstring.h" +#include "string.h" #include "dolphin/os.h" #include diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/src/JSystem/JHostIO/JHIMccBuf.cpp index 0e539630ce..0e2e8a2f4c 100644 --- a/src/JSystem/JHostIO/JHIMccBuf.cpp +++ b/src/JSystem/JHostIO/JHIMccBuf.cpp @@ -3,11 +3,8 @@ #include "JSystem/JHostIO/JHIMccBuf.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JHostIO/JHIRMcc.h" -#include -#include - -extern "C" int HIO2Read(u32, u32, void*, u32); -extern "C" int HIO2Write(u32, u32, void*, u32); +#include +#include void JHIReport(const char* fmt, ...) {} diff --git a/src/JSystem/JHostIO/JHIRMcc.cpp b/src/JSystem/JHostIO/JHIRMcc.cpp index de7ee3194a..b22a19d365 100644 --- a/src/JSystem/JHostIO/JHIRMcc.cpp +++ b/src/JSystem/JHostIO/JHIRMcc.cpp @@ -1,20 +1,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JHostIO/JHIMccBuf.h" +#include -enum HIO2DeviceType { - DEVICE_INVALID = -1, -}; - -typedef BOOL (*HIO2EnumCallback)(HIO2DeviceType); -typedef void (*HIO2DisconnectCallback)(s32); - -extern "C" BOOL HIO2Init(); -extern "C" BOOL HIO2EnumDevices(HIO2EnumCallback); -extern "C" BOOL HIO2Close(s32); -extern "C" s32 HIO2Open(HIO2DeviceType, int, HIO2DisconnectCallback); - -HIO2DeviceType gExiDevice = DEVICE_INVALID; +HIO2DeviceType gExiDevice = HIO2_DEVICE_INVALID; u8 data_8074bd04 = 1; s32 ghHIO2; @@ -29,7 +18,7 @@ BOOL JHIhio2CallbackEnum(HIO2DeviceType type) { } void JHIhio2DisconnectCallback(s32) { - gExiDevice = DEVICE_INVALID; + gExiDevice = HIO2_DEVICE_INVALID; } u32 JHIInitInterface() { @@ -45,7 +34,7 @@ u32 JHIInitInterface() { data_8074bd04 = 0; } - if (gExiDevice == DEVICE_INVALID) { + if (gExiDevice == HIO2_DEVICE_INVALID) { return 0; } diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 08652656b0..251821acf4 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -7,7 +7,7 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "math.h" +#include #include "string.h" JKRAramArchive::JKRAramArchive(s32 entryNumber, JKRArchive::EMountDirection mountDirection) diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/src/JSystem/JKernel/JKRAramHeap.cpp index 91fea19b00..960e3aedfa 100644 --- a/src/JSystem/JKernel/JKRAramHeap.cpp +++ b/src/JSystem/JKernel/JKRAramHeap.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRAramHeap.h" #include "JSystem/JKernel/JKRHeap.h" #include "global.h" -#include +#include JSUList JKRAramHeap::sAramList; diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 4c02d4ed8b..7a5c813085 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -10,7 +10,7 @@ #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "math.h" +#include #include "string.h" #include diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index f5ec5aed60..5436e7a808 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -6,7 +6,7 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "math.h" +#include #include "string.h" #include "global.h" #include diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index 510ccd3132..da157b43b1 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" -#include "stdio.h" +#include #include "global.h" #include diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/src/JSystem/JMath/JMATrigonometric.cpp index e037400994..605353736d 100644 --- a/src/JSystem/JMath/JMATrigonometric.cpp +++ b/src/JSystem/JMath/JMATrigonometric.cpp @@ -2,7 +2,7 @@ // don't include header until this "zero" mess is figured out // #include "JSystem/JMath/JMATrigonometric.h" -#include "math.h" +#include #include "global.h" static f32 dummy() { diff --git a/src/JSystem/JStage/JSGCamera.cpp b/src/JSystem/JStage/JSGCamera.cpp index caf5865873..19a16cf5b5 100644 --- a/src/JSystem/JStage/JSGCamera.cpp +++ b/src/JSystem/JStage/JSGCamera.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStage/JSGCamera.h" -#include "limits.h" +#include JStage::TCamera::~TCamera() {} diff --git a/src/JSystem/JStage/JSGFog.cpp b/src/JSystem/JStage/JSGFog.cpp index b0fd300031..0f63fedd7e 100644 --- a/src/JSystem/JStage/JSGFog.cpp +++ b/src/JSystem/JStage/JSGFog.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStage/JSGFog.h" -#include "limits.h" +#include JStage::TFog::~TFog() {} diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index 7ca04c6252..818d891b90 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -5,9 +5,9 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JGadget/linklist.h" -#include "math.h" -#include "stdlib.h" -#include "limits.h" +#include +#include +#include namespace JStudio { diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp index b2922f2be3..ce703f62dc 100644 --- a/src/JSystem/JStudio/JStudio/fvb.cpp +++ b/src/JSystem/JStudio/JStudio/fvb.cpp @@ -249,7 +249,7 @@ void TObject_transition::prepare_data_(const data::TParse_TParagraph::TData& rDa ASSERT(rData.u32Type == data::PARAGRAPH_DATA); u32 u32Size = rData.u32Size; - JUT_EXPECT(u32size == 8); + JGADGET_ASSERTWARN(0, u32Size == 8); const f32* pContent = static_cast(rData.pContent); ASSERT(pContent != NULL); @@ -263,7 +263,7 @@ void TObject_list::prepare_data_(const data::TParse_TParagraph::TData& rData, TC ASSERT(rData.u32Type == data::PARAGRAPH_DATA); u32 u32Size = rData.u32Size; - JUT_EXPECT(u32size >= 8); + JGADGET_ASSERTWARN(0, u32Size >= 8); const ListData* pContent = static_cast(rData.pContent); ASSERT(pContent != NULL); @@ -280,7 +280,7 @@ void TObject_list_parameter::prepare_data_(const data::TParse_TParagraph::TData& ASSERT(rData.u32Type == data::PARAGRAPH_DATA); u32 u32Size = rData.u32Size; - JUT_EXPECT(u32size >= 8); + JGADGET_ASSERTWARN(0, u32Size >= 8); const ListData* pContent = static_cast(rData.pContent); ASSERT(pContent != NULL); @@ -295,7 +295,7 @@ void TObject_hermite::prepare_data_(const data::TParse_TParagraph::TData& rData, ASSERT(rData.u32Type == data::PARAGRAPH_DATA); u32 u32Size = rData.u32Size; - JUT_EXPECT(u32size >= 8); + JGADGET_ASSERTWARN(0, u32Size >= 8); const ListData* pContent = static_cast(rData.pContent); ASSERT(pContent != NULL); @@ -306,7 +306,7 @@ void TObject_hermite::prepare_data_(const data::TParse_TParagraph::TData& rData, TControl::TControl() : pFactory(NULL) {} TControl::~TControl() { - JUT_EXPECT(ocObject_.empty()); + JGADGET_ASSERTWARN(0, ocObject_.empty()); } void TControl::appendObject(TObject* object) { diff --git a/src/JSystem/JStudio/JStudio/jstudio-math.cpp b/src/JSystem/JStudio/JStudio/jstudio-math.cpp index a2faada02a..e6c5403b64 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-math.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-math.cpp @@ -3,15 +3,15 @@ #include "JSystem/JStudio/JStudio/jstudio-math.h" #include "JSystem/JGeometry.h" #include "JSystem/TPosition3.h" -#include "math.h" +#include void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) { - f32 cosx = i_cosf(DEG_TO_RAD(x)); - f32 sinx = i_sinf(DEG_TO_RAD(x)); - f32 cosy = i_cosf(DEG_TO_RAD(y)); - f32 siny = i_sinf(DEG_TO_RAD(y)); - f32 cosz = i_cosf(DEG_TO_RAD(z)); - f32 sinz = i_sinf(DEG_TO_RAD(z)); + f32 cosx = cosf(DEG_TO_RAD(x)); + f32 sinx = sinf(DEG_TO_RAD(x)); + f32 cosy = cosf(DEG_TO_RAD(y)); + f32 siny = sinf(DEG_TO_RAD(y)); + f32 cosz = cosf(DEG_TO_RAD(z)); + f32 sinz = sinf(DEG_TO_RAD(z)); f32 cosxcosz = cosx * cosz; f32 cosxsinz = cosx * sinz; f32 sinxcosz = sinx * cosz; diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp index c7270facf1..a84ad897ed 100644 --- a/src/JSystem/JStudio/JStudio/stb.cpp +++ b/src/JSystem/JStudio/JStudio/stb.cpp @@ -46,7 +46,7 @@ TObject::TObject(const data::TParse_TBlock_object& object) pSequence_next(object.getContent()), u32Wait_(0), mStatus(STATUS_STILL) {} TObject::~TObject() { - JUT_EXPECT(getControl() == NULL); + JGADGET_ASSERTWARN(0, getControl() == NULL); } void TObject::setFlag_operation(u8 op, int val) { @@ -205,26 +205,26 @@ void TObject::process_sequence_() { switch (type) { case 0: - JUT_EXPECT(u32Value == 0); - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, u32Value == 0); + JGADGET_ASSERTWARN(0, pContent == NULL); break; case 1: - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, pContent == NULL); setFlag_operation_(u32Value); break; case 2: - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, pContent == NULL); setWait(u32Value); break; case 3: { - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, pContent == NULL); s32 off = toInt32FromUInt24_(u32Value); void* nextseq = (void*)getSequence_offset(off); setSequence_next(nextseq); break; } case 4: { - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, pContent == NULL); u32 val = toInt32FromUInt24_(u32Value); suspend(val); break; @@ -246,7 +246,7 @@ void TObject::process_sequence_() { p = (void*)para_dat.next; ASSERT(p != NULL); } - JUT_EXPECT(p == pNext); + JGADGET_ASSERTWARN(0, p == pNext); break; } default: @@ -302,19 +302,19 @@ TControl::TControl() : _4(0), _8(0), pFactory(NULL), mObject_control(NULL, 0), _ TControl::~TControl() { mObject_control.setControl_(NULL); - JUT_EXPECT(ocObject_.empty()); + JGADGET_ASSERTWARN(0, ocObject_.empty()); } void TControl::appendObject(TObject* p) { p->setControl_(this); - mObjectContainer.Push_back(p); + ocObject_.Push_back(p); } void TControl::removeObject(TObject* p) { ASSERT(p != NULL); ASSERT(p->getControl() == this); p->setControl_(NULL); - mObjectContainer.Erase(p); + ocObject_.Erase(p); } void TControl::destroyObject(TObject* p) { @@ -324,15 +324,15 @@ void TControl::destroyObject(TObject* p) { } void TControl::destroyObject_all() { - while (!mObjectContainer.empty()) { - destroyObject(&mObjectContainer.back()); + while (!ocObject_.empty()) { + destroyObject(&ocObject_.back()); } } // NONMATCHING - TPRObject_ID_equal copy issue TObject* TControl::getObject(void const* param_0, u32 param_1) { - JGadget::TLinkList::iterator begin = mObjectContainer.begin(); - JGadget::TLinkList::iterator end = mObjectContainer.end(); + JGadget::TLinkList::iterator begin = ocObject_.begin(); + JGadget::TLinkList::iterator end = ocObject_.end(); JGadget::TLinkList::iterator local_50 = std::find_if(begin, end, object::TPRObject_ID_equal(param_0, param_1)); if ((local_50 != end) != false) { return &*local_50; @@ -343,7 +343,7 @@ TObject* TControl::getObject(void const* param_0, u32 param_1) { void TControl::reset() { resetStatus_(); mObject_control.reset(); - JGadget::TContainerEnumerator > aTStack_18(mObjectContainer); + JGadget::TContainerEnumerator > aTStack_18(ocObject_); while (aTStack_18) { (*aTStack_18).reset(); } @@ -354,7 +354,7 @@ bool TControl::forward(u32 param_0) { bool rv = mObject_control.forward(param_0); int uVar7 = 0xf; int uVar6 = 0; - JGadget::TContainerEnumerator > aTStack_38(mObjectContainer); + JGadget::TContainerEnumerator > aTStack_38(ocObject_); while (aTStack_38) { JStudio::stb::TObject& this_00 = *aTStack_38; rv = this_00.forward(param_0) || rv; diff --git a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp b/src/JSystem/JStudio/JStudio_JStage/object-light.cpp index a3291af3fb..a50643a30f 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-light.cpp @@ -93,12 +93,12 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) { f32 dVar10 = adaptor_getVariableValue(10)->getValue(); f32 dVar11 = adaptor_getVariableValue(11)->getValue(); f32 temp = MTXDegToRad(dVar11); - f32 dVar12 = i_cosf(temp); - f32 sinVal = i_sinf(temp); + f32 dVar12 = cosf(temp); + f32 sinVal = sinf(temp); f32 temp2 = MTXDegToRad(dVar10); - VStack_198.direction.x = dVar12 * i_sinf(temp2); + VStack_198.direction.x = dVar12 * sinf(temp2); VStack_198.direction.y = sinVal; - VStack_198.direction.z = dVar12 * i_cosf(temp2); + VStack_198.direction.z = dVar12 * cosf(temp2); break; } case 2: diff --git a/src/JSystem/JSupport/JSUOutputStream.cpp b/src/JSystem/JSupport/JSUOutputStream.cpp index 046ab59bda..3732397523 100644 --- a/src/JSystem/JSupport/JSUOutputStream.cpp +++ b/src/JSystem/JSupport/JSUOutputStream.cpp @@ -3,7 +3,7 @@ #include "JSystem/JSupport/JSUOutputStream.h" #include "JSystem/JSupport/JSURandomOutputStream.h" #include -#include +#include JSUOutputStream::~JSUOutputStream() { if (!isGood()) { diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/src/JSystem/JUtility/JUTAssert.cpp index 1f52ba1178..16029f3036 100644 --- a/src/JSystem/JUtility/JUTAssert.cpp +++ b/src/JSystem/JUtility/JUTAssert.cpp @@ -4,7 +4,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTDirectPrint.h" -#include "stdio.h" +#include #include bool sAssertVisible = true; diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index 73fdb28545..5537b321f7 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" -#include "stdio.h" +#include JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont; diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp index 9f270696b3..799d8ae78b 100644 --- a/src/JSystem/JUtility/JUTDirectPrint.cpp +++ b/src/JSystem/JUtility/JUTDirectPrint.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTDirectPrint.h" -#include "stdio.h" +#include #include #include "global.h" diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/limits.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h similarity index 73% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/limits.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h index e8f381874e..91c3dedf0e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/limits.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h @@ -1,39 +1,8 @@ -#ifndef _STD_LIMITS_H -#define _STD_LIMITS_H +#ifndef _MSL_LIMITS_H +#define _MSL_LIMITS_H -#include "float.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define CHAR_BIT 8 - -#define SCHAR_MIN (-0x7F - 1) -#define SCHAR_MAX 0x7F -#define UCHAR_MAX 0xFF - -#define CHAR_MIN 0 -#define CHAR_MAX SCHAR_MAX - -#define SHRT_MIN (-0x7FFF - 1) -#define SHRT_MAX 0x7FFF -#define USHRT_MAX 0xFFFF - -#define INT_MIN (-0x7FFFFFFF - 1) -#define INT_MAX 0x7FFFFFFF -#define UINT_MAX 0xFFFFFFFF - -#define LONG_MIN (-0x7FFFFFFFL - 1) -#define LONG_MAX 0x7FFFFFFFL -#define ULONG_MAX 0xFFFFFFFFUL - -#define LLONG_MIN (-0x7FFFFFFFFFFFFFFFLL - 1) -#define LLONG_MAX 0x7FFFFFFFFFFFFFFFLL -#define ULLONG_MAX 0xFFFFFFFFFFFFFFFFULL - -#ifdef __cplusplus -} +#include +#include namespace std { template @@ -119,5 +88,5 @@ public: #endif } // namespace std -#endif + #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h index 2ea0a31a6a..4eac9e7a1b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_FILE_POS_H #define _MSL_COMMON_FILE_POS_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { @@ -15,4 +15,4 @@ long ftell(FILE* file); } #endif -#endif /* _MSL_COMMON_FILE_POS_H */ \ No newline at end of file +#endif /* _MSL_COMMON_FILE_POS_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h index 7a6673a312..1207adcd07 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h @@ -1,7 +1,6 @@ #ifndef _MSL_COMMON_ALLOC_H #define _MSL_COMMON_ALLOC_H - #ifdef __cplusplus extern "C" { #endif @@ -12,4 +11,4 @@ void free(void* ptr); } #endif -#endif /* _MSL_COMMON_ALLOC_H */ \ No newline at end of file +#endif /* _MSL_COMMON_ALLOC_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h index 6e399f5365..6ad791a935 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_ANSI_FILES_H #define _MSL_COMMON_ANSI_FILES_H -#include "stddef.h" +#include #ifdef __cplusplus extern "C" { @@ -13,9 +13,6 @@ extern "C" { typedef unsigned long __file_handle; typedef unsigned long fpos_t; -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif #define set_error(file) \ do { \ @@ -126,4 +123,4 @@ void __close_all(void); }; #endif -#endif /* _MSL_COMMON_ANSI_FILES_H */ \ No newline at end of file +#endif /* _MSL_COMMON_ANSI_FILES_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h index 1c04922944..8c781b46b5 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h @@ -1,7 +1,6 @@ #ifndef _MSL_COMMON_ANSI_FP_H #define _MSL_COMMON_ANSI_FP_H - #define SIGDIGLEN 36 typedef struct decimal { @@ -21,15 +20,4 @@ typedef struct decform { short digits; } decform; -/* void __ull2dec(decimal*, u64); -void __timesdec(decimal*, const decimal*, const decimal*); -void __str2dec(decimal*, const char*, short); -void __two_exp(decimal*, s32); -BOOL __equals_dec(const decimal*, const decimal*); -BOOL __less_dec(const decimal*, const decimal*); -void __minus_dec(decimal*, const decimal*, const decimal*); -void __num2dec_internal(decimal*, f64); -void __num2dec(const decform*, f64, decimal*); -f64 __dec2num(const decimal*); */ - -#endif \ No newline at end of file +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h index a764ac297f..eabc120a1c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h @@ -1,11 +1,11 @@ #ifndef _MSL_COMMON_BUFFER_IO_H #define _MSL_COMMON_BUFFER_IO_H -#include "ansi_files.h" +#include enum { __align_buffer, __dont_align_buffer }; void __prep_buffer(FILE* file); int __flush_buffer(FILE* file, size_t* bytes_flushed); -#endif /* _MSL_COMMON_BUFFER_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_BUFFER_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h index 5ac7be5cca..e495416680 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_CHAR_IO_H #define _MSL_COMMON_CHAR_IO_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { @@ -14,4 +14,4 @@ int __put_char(int c, FILE* stream); } #endif -#endif /* _MSL_COMMON_CHAR_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_CHAR_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h new file mode 100644 index 0000000000..bae336179e --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h @@ -0,0 +1,37 @@ +#ifndef _MSL_CLIMITS_H +#define _MSL_CLIMITS_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define CHAR_BIT 8 + +#define SCHAR_MIN (-0x7F - 1) +#define SCHAR_MAX 0x7F +#define UCHAR_MAX 0xFF + +#define CHAR_MIN 0 +#define CHAR_MAX SCHAR_MAX + +#define SHRT_MIN (-0x7FFF - 1) +#define SHRT_MAX 0x7FFF +#define USHRT_MAX 0xFFFF + +#define INT_MIN (-0x7FFFFFFF - 1) +#define INT_MAX 0x7FFFFFFF +#define UINT_MAX 0xFFFFFFFF + +#define LONG_MIN (-0x7FFFFFFFL - 1) +#define LONG_MAX 0x7FFFFFFFL +#define ULONG_MAX 0xFFFFFFFFUL + +#define LLONG_MIN (-0x7FFFFFFFFFFFFFFFLL - 1) +#define LLONG_MAX 0x7FFFFFFFFFFFFFFFLL +#define ULLONG_MAX 0xFFFFFFFFFFFFFFFFULL + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h index 419e57fec5..ad501c896f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h @@ -1,60 +1,126 @@ -#ifndef STD_CMATH_H_ -#define STD_CMATH_H_ +#ifndef MSL_CMATH_H_ +#define MSL_CMATH_H_ -namespace std { -template -inline double fabs(T x) { - return ::fabs(x); +#include + +#define NAN (*(float*) __float_nan) +#define HUGE_VALF (*(float*) __float_huge) + +#define M_PI 3.14159265358979323846f +#define M_SQRT3 1.73205f + +#define DEG_TO_RAD(degrees) (degrees * (M_PI / 180.0f)) +#define RAD_TO_DEG(radians) (radians * (180.0f / M_PI)) + +#ifdef __cplusplus +extern "C" { +#endif + +extern double __frsqrte(double); +extern float __fres(float); +extern double __fabs(double); +extern float __fabsf(float); + +int abs(int); +double acos(double); +float acosf(float); +double asin(double); +double atan(double); +double atan2(double, double); +double ceil(double); +double copysign(double, double); +double cos(double); +float cosf(float); +double exp(double); +double floor(double); +double fmod(double, double); +double frexp(double, int*); +double ldexp(double, int); +double modf(double, double*); +double pow(double, double); +float powf(float, float); +double sin(double); +float sinf(float); +double sqrt(double); +double tan(double); +float tanf(float); + +inline float expf(float x) { + return exp(x); } -inline float fabs(float num) { - return ::fabsf(num); +inline float ceilf(float num) { + return ceil(num); } -inline float fabsf(float num) { - return ::fabsf(num); +inline double fabs(double f) { + return __fabs(f); } -inline float sqrt(float x) { - return ::sqrtf(x); +inline float fabsf(float f) { + return (float)fabs((double)f); } -inline float abs(float x) { - return ::fabsf(x); +inline float floorf(float num) { + return floor(num); } -inline float fmod(float x, float y) { - return ::fmod(x, y); +inline float fmodf(float f1, float f2) { + return fmod(f1, f2); } -inline float ceil(float num) { - return ::ceilf(num); +#include "global.h" +#if PLATFORM_WII || PLATFORM_SHIELD +inline float sqrtf(float mag) { + return sqrt(mag); +} +#else +#ifdef DECOMPCTX +// Hack to mitigate fake mismatches when building from decompctx output +// (which doesn't support precompiled headers). +// +// When built without a PCH, these constants would end up .rodata instead of .data +// which causes a variety of knock-on effects in individual functions' assembly. +// +// Making them into globals is a bit of a hack, but it generally fixes later +// .data and .rodata offsets and allows individual functions to match. +static double _half = 0.5; +static double _three = 3.0; +#endif +inline float sqrtf(float mag) { +#ifndef DECOMPCTX + // part of the same hack, these are defined outside of the function when using decompctx + static const double _half = 0.5; + static const double _three = 3.0; +#endif + if (mag > 0.0f) { + double dmag = (double)mag; + double tmpd = __frsqrte(dmag); + tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); + tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); + tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); + return (float)(dmag * tmpd); + } else if (mag < 0.0) { + return NAN; + } else if (isnan(mag)) { + return NAN; + } else { + return mag; + } +} +#endif + +inline float atan2f(float y, float x) { + return (float)atan2(y, x); } -inline float floor(float num) { - return ::floorf(num); -} +inline float sinf(float x) { return sin(x); } +inline float cosf(float x) { return cos(x); } +inline float tanf(float x) { return tan(x); } +inline float acosf(float x) { return acos(x); } -inline float tan(float num) { - return ::i_tanf(num); -} - -inline float tanf(float num) { - return ::i_tanf(num); -} - -inline float acos(float num) { - return ::acosf(num); -} - -inline float pow(float x, float y) { - return ::pow(x, y); -} - -inline float pow(float x, int y) { - // FIXME: Needs to use powf - return ::pow(x, y); -} -} // namespace std +#ifdef __cplusplus +}; +#endif #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h new file mode 100644 index 0000000000..5f54f9a6f9 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h @@ -0,0 +1,6 @@ +#ifndef _MSL_CSTDARG_H_ +#define _MSL_CSTDARG_H_ + +#include + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h new file mode 100644 index 0000000000..cd142bcf60 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h @@ -0,0 +1,25 @@ +#ifndef _MSL_CSTDDEF_H_ +#define _MSL_CSTDDEF_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define offsetof(type, member) ((size_t)&(((type*)0)->member)) + +#ifndef NULL +#define NULL 0 +#endif + +typedef unsigned long size_t; +typedef long ptrdiff_t; + +#ifndef __cplusplus +typedef unsigned short wchar_t; +#endif + +#ifdef __cplusplus +}; +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h new file mode 100644 index 0000000000..2a966f076a --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h @@ -0,0 +1,16 @@ +#ifndef MSL_CSTDIO_H_ +#define MSL_CSTDIO_H_ + +#include +#include +#include +#include +#include +#include +#include + +#define stdin (&__files._stdin) +#define stdout (&__files._stdout) +#define stderr (&__files._stderr) + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h new file mode 100644 index 0000000000..ae12232293 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h @@ -0,0 +1,8 @@ +#ifndef MSL_CSTDLIB_H_ +#define MSL_CSTDLIB_H_ + +#include +#include +#include + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h index 39088020e5..2290c183cb 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h @@ -1,23 +1,31 @@ -#ifndef STD_CSTRING_H_ -#define STD_CSTRING_H_ +#ifndef _MSL_CSTRING_H +#define _MSL_CSTRING_H -#include "string.h" - -namespace std { -using ::strlen; -using ::strcpy; -using ::wcslen; -using ::strncpy; -using ::strcmp; -using ::strncmp; -using ::strcat; - -using ::memset; -using ::memcpy; - -inline char* strchr(char* str, int c) { - return ::strchr(str, c); -} -}; // namespace std +#include +#include +#include +#ifdef __cplusplus +extern "C" { #endif + +void* memcpy(void* dst, const void* src, size_t n); +void* memset(void* dst, int val, size_t n); +int memcmp(const void* lhs, const void* rhs, size_t count); +void* __memrchr(const void* ptr, int ch, size_t count); +void* memchr(const void* ptr, int ch, size_t count); +void* memmove(void* dst, const void* src, size_t n); +char* strrchr(const char* str, int c); +char* strchr(const char* str, int c); +int strncmp(const char* str1, const char* str2, size_t n); +int strcmp(const char* str1, const char* str2); +char* strcat(char* dst, const char* src); +char* strncpy(char* dst, const char* src, size_t n); +char* strcpy(char* dst, const char* src); +size_t strlen(const char* str); + +#ifdef __cplusplus +}; +#endif + +#endif /* _MSL_COMMON_STRING_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h index 2f293cbaff..c7f5a1b12e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_DIRECT_IO_H #define _MSL_COMMON_DIRECT_IO_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { @@ -14,4 +14,4 @@ size_t fwrite(const void* buffer, size_t size, size_t count, FILE* stream); } #endif -#endif /* _MSL_COMMON_DIRECT_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_DIRECT_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h index e6417f07b1..7adcede674 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h @@ -1,15 +1,18 @@ #ifndef _MSL_COMMON_EXTRAS_H #define _MSL_COMMON_EXTRAS_H +#include + #ifdef __cplusplus extern "C" { #endif int strnicmp(const char* str1, const char* str2, int n); int stricmp(const char* str1, const char* str2); +size_t wcslen(const wchar_t* s); #ifdef __cplusplus } #endif -#endif /* _MSL_COMMON_EXTRAS_H */ \ No newline at end of file +#endif /* _MSL_COMMON_EXTRAS_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h index a71bc4232b..34cd0ce33a 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_FILE_IO_H #define _MSL_COMMON_FILE_IO_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { @@ -15,4 +15,4 @@ int fclose(FILE* file); } #endif -#endif /* _MSL_COMMON_FILE_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_FILE_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h index 418b52a88e..ad2e24f96d 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_FLOAT_H #define _MSL_COMMON_FLOAT_H -#include "fdlibm.h" +#include #define FP_SNAN 0 #define FP_QNAN 1 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h index dcfd960ab2..ad27789b8b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h @@ -1,130 +1,62 @@ #ifndef MSL_MATH_H_ #define MSL_MATH_H_ -#include "global.h" -#include "float.h" +#include -#define NAN (*(float*) __float_nan) -#define HUGE_VALF (*(float*) __float_huge) - -#define M_PI 3.14159265358979323846f -#define M_SQRT3 1.73205f - -#define DEG_TO_RAD(degrees) (degrees * (M_PI / 180.0f)) -#define RAD_TO_DEG(radians) (radians * (180.0f / M_PI)) - -#ifdef __cplusplus -extern "C" { -#endif - -int abs(int); -double acos(double); -float acosf(float); -double asin(double); -double atan(double); -double atan2(double, double); - -double ceil(double); -inline float ceilf(float num) { - return ceil(num); +namespace std { +template +inline double fabs(T x) { + return ::fabs(x); } -double copysign(double, double); -double cos(double); -float cosf(float); -double exp(double); - -inline float expf(float x) { - return exp(x); +inline float fabs(float num) { + return ::fabsf(num); } -extern double __frsqrte(double); -extern float __fres(float); - -extern double __fabs(double); -extern float __fabsf(float); -inline double fabs(double f) { - return __fabs(f); -} -inline double fabsf2(float f) { - return __fabsf(f); -} -inline float fabsf(float f) { - return fabsf2(f); +inline float fabsf(float num) { + return ::fabsf(num); } -double floor(double); -inline float floorf(float num) { - return floor(num); +inline float sqrt(float x) { + return ::sqrtf(x); } -double fmod(double, double); -inline float fmodf(float f1, float f2) { - return fmod(f1, f2); +inline float abs(float x) { + return ::fabsf(x); } -double frexp(double, int*); -double ldexp(double, int); -double modf(double, double*); -double pow(double, double); -float powf(float, float); -double sin(double); -float sinf(float); -double sqrt(double); -double tan(double); -float tanf(float); - -#if PLATFORM_WII || PLATFORM_SHIELD -inline float sqrtf(float mag) { - return sqrt(mag); -} -#else -#ifdef DECOMPCTX -// Hack to mitigate fake mismatches when building from decompctx output -// (which doesn't support precompiled headers). -// -// When built without a PCH, these constants would end up .rodata instead of .data -// which causes a variety of knock-on effects in individual functions' assembly. -// -// Making them into globals is a bit of a hack, but it generally fixes later -// .data and .rodata offsets and allows individual functions to match. -static double _half = 0.5; -static double _three = 3.0; -#endif -inline float sqrtf(float mag) { -#ifndef DECOMPCTX - // part of the same hack, these are defined outside of the function when using decompctx - static const double _half = 0.5; - static const double _three = 3.0; -#endif - if (mag > 0.0f) { - double dmag = (double)mag; - double tmpd = __frsqrte(dmag); - tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); - tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); - tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); - return (float)(dmag * tmpd); - } else if (mag < 0.0) { - return NAN; - } else if (isnan(mag)) { - return NAN; - } else { - return mag; - } -} -#endif - -inline float atan2f(float y, float x) { - return (float)atan2(y, x); +inline float fmod(float x, float y) { + return ::fmod(x, y); } -inline float i_sinf(float x) { return sin(x); } -inline float i_cosf(float x) { return cos(x); } -inline float i_tanf(float x) { return tan(x); } -inline float i_acosf(float x) { return acos(x); } +inline float ceil(float num) { + return ::ceilf(num); +} -#ifdef __cplusplus -}; -#endif +inline float floor(float num) { + return ::floorf(num); +} + +inline float tan(float num) { + return ::tanf(num); +} + +inline float tanf(float num) { + return ::tanf(num); +} + +inline float acos(float num) { + return ::acosf(num); +} + +inline float pow(float x, float y) { + return ::pow(x, y); +} + +inline float pow(float x, int y) { + // FIXME: Needs to use powf + return ::pow(x, y); +} +} // namespace std #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h index d999b6ea1f..8b0a236ec0 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_MBSTRING_H #define _MSL_COMMON_MBSTRING_H -#include "wchar_io.h" +#include #ifdef __cplusplus extern "C" { @@ -13,4 +13,4 @@ size_t wcstombs(char* dst, const wchar_t* src, size_t n); } #endif -#endif /* _MSL_COMMON_MBSTRING_H */ \ No newline at end of file +#endif /* _MSL_COMMON_MBSTRING_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h index d9ee49d96c..94f32a9e35 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_MEM_FUNCS_H #define _MSL_COMMON_MEM_FUNCS_H -#include "stddef.h" +#include #ifdef __cplusplus extern "C" { @@ -16,4 +16,4 @@ void __copy_longs_aligned(void* dst, const void* src, size_t n); } #endif -#endif /* _MSL_COMMON_MEM_FUNCS_H */ \ No newline at end of file +#endif /* _MSL_COMMON_MEM_FUNCS_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h index 0e2bb9673b..9c76f61882 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h @@ -1,8 +1,8 @@ #ifndef _MSL_COMMON_PRINTF_H #define _MSL_COMMON_PRINTF_H -#include "ansi_files.h" -#include "__va_arg.h" +#include +#include #ifdef __cplusplus extern "C" { @@ -18,13 +18,6 @@ int vprintf(const char* format, va_list arg); int vswprintf(wchar_t* s, size_t n, const wchar_t* format, va_list arg); -#if defined(__cplusplus) -namespace std { - extern "C" { using ::vsnprintf; } - extern "C" { using ::vswprintf; } -} -#endif - #ifdef __cplusplus } #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h index 53543a129a..434386eb91 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_SCANF_H #define _MSL_COMMON_SCANF_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h new file mode 100644 index 0000000000..849ca8be5a --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h @@ -0,0 +1,18 @@ +#ifndef _MSL_STDARG_H_ +#define _MSL_STDARG_H_ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +namespace std { + using ::va_list; +} + +#ifdef __cplusplus +}; +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h index 7a3e963fcc..69fc7cf83f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h @@ -1,23 +1,16 @@ -#ifndef _STDDEF_H_ -#define _STDDEF_H_ +#ifndef _MSL_STDDEF_H_ +#define _MSL_STDDEF_H_ + +#include #ifdef __cplusplus extern "C" { #endif -#if defined __INTELLISENSE__ -typedef unsigned int size_t; -typedef int ptrdiff_t; -#else -typedef unsigned long size_t; -typedef long ptrdiff_t; -#endif - -#define offsetof(type, member) ((size_t)&(((type*)0)->member)) - -#ifndef NULL -#define NULL (0) -#endif +namespace std { + using ::ptrdiff_t; + using ::size_t; +} #ifdef __cplusplus }; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h index d6d4016944..950bead4cc 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h @@ -1,14 +1,30 @@ #ifndef MSL_STDIO_H_ #define MSL_STDIO_H_ -#include "char_io.h" -#include "file_io.h" -#include "printf.h" -#include "extras.h" -#include "scanf.h" +#include +#include +#include -#define stdin (&__files._stdin) -#define stdout (&__files._stdout) -#define stderr (&__files._stderr) +#ifdef __cplusplus +extern "C" { +#endif + +namespace std { + using ::fputs; + using ::fflush; + using ::fclose; + using ::fprintf; + using ::printf; + using ::sprintf; + using ::snprintf; + using ::vsnprintf; + using ::vprintf; + using ::vswprintf; + using ::sscanf; +} + +#ifdef __cplusplus +}; +#endif #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h index a96b8f1799..409d5598f8 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h @@ -1,8 +1,24 @@ -#ifndef MSL_STDLIB_H_ -#define MSL_STDLIB_H_ +#ifndef _MSL_STDLIB_H_ +#define _MSL_STDLIB_H_ -#include "abort_exit.h" -#include "arith.h" -#include "strtoul.h" +#include -#endif \ No newline at end of file +#ifdef __cplusplus +extern "C" { +#endif + +namespace std { + using ::strtol; + using ::strtoul; + using ::div; + using ::exit; + using ::abort; + using ::atoi; + using ::atof; +} + +#ifdef __cplusplus +}; +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h index 311cd44fb2..e478d7e8eb 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h @@ -1,32 +1,30 @@ -#ifndef _MSL_COMMON_STRING_H -#define _MSL_COMMON_STRING_H +#ifndef MSL_STRING_H_ +#define MSL_STRING_H_ -#include "stddef.h" -#include "ansi_files.h" +#include + +namespace std { +using ::memcpy; +using ::memset; +using ::memcmp; +using ::memchr; +using ::memmove; + +using ::strrchr; +using ::strlen; +using ::strncmp; +using ::strcmp; +using ::strcat; +using ::strncpy; +using ::strcpy; + +using ::strnicmp; +using ::stricmp; +using ::wcslen; + +inline char* strchr(char* str, int c) { + return ::strchr(str, c); +} +}; // namespace std -#ifdef __cplusplus -extern "C" { #endif - -void* memcpy(void* dst, const void* src, size_t n); -void* memset(void* dst, int val, size_t n); -int memcmp(const void* lhs, const void* rhs, size_t count); -void* __memrchr(const void* ptr, int ch, size_t count); -void* memchr(const void* ptr, int ch, size_t count); -void* memmove(void* dst, const void* src, size_t n); -char* strrchr(const char* str, int c); -char* strchr(const char* str, int c); -int strncmp(const char* str1, const char* str2, size_t n); -int strcmp(const char* str1, const char* str2); -char* strcat(char* dst, const char* src); -char* strncpy(char* dst, const char* src, size_t n); -char* strcpy(char* dst, const char* src); -size_t strlen(const char* str); - -size_t wcslen(const wchar_t* s); - -#ifdef __cplusplus -}; -#endif - -#endif /* _MSL_COMMON_STRING_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h index e504b9552e..7d637f763b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h @@ -9,9 +9,11 @@ long strtol(const char* str, char** end, int base); unsigned long strtoul(const char* str, char** end, int base); unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, int* negative, int* overflow); +int atoi(const char* str); +float atof(const char* str); #ifdef __cplusplus } #endif -#endif /* _MSL_COMMON_STRTOUL_H */ \ No newline at end of file +#endif /* _MSL_COMMON_STRTOUL_H */ diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h similarity index 87% rename from src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h index 4867f2d25a..04a8cfe7fc 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h @@ -1,5 +1,5 @@ -#ifndef __VA_ARG_H -#define __VA_ARG_H +#ifndef MSL_VA_LIST_H +#define MSL_VA_LIST_H #ifdef __cplusplus extern "C" { @@ -35,10 +35,6 @@ void* __va_arg(_va_list_struct*, int); #define __va_copy(a, b) (*(a) = *(b)) -#if defined(__cplusplus) -namespace std { extern "C" { using ::va_list; } } -#endif - #ifdef __cplusplus } #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h index 999db81171..a8437db767 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h @@ -1,12 +1,8 @@ #ifndef _MSL_COMMON_WCHAR_IO_H #define _MSL_COMMON_WCHAR_IO_H -#include "ansi_files.h" - -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif +#include int fwide(FILE* file, int mode); -#endif /* _MSL_COMMON_WCHAR_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_WCHAR_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c index 3c49dff88d..230f504a6f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c @@ -1,6 +1,6 @@ #include "abort_exit.h" #include "critical_regions.h" -#include "stddef.h" +#include "cstddef.h" extern void (*_dtors[])(void); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c index 3ed7a41667..c06fb26075 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c @@ -1,6 +1,6 @@ #include "alloc.h" #include "critical_regions.h" -#include +#include typedef struct Block { struct Block* prev; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c index 83e6ef90e4..d4daab1605 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c @@ -1,5 +1,5 @@ #include "mbstring.h" -#include "string.h" +#include "cstring.h" inline static int unicode_to_UTF8(char* s, wchar_t wchar) { int number_of_bytes; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c index 2676978173..07f69f33b4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c @@ -1,4 +1,4 @@ -#include "string.h" +#include "cstring.h" void* memmove(void* dst, const void* src, size_t n) { unsigned char* csrc; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c index 183eb71775..a737596dd9 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c @@ -3,8 +3,8 @@ #include "critical_regions.h" #include "ctype.h" #include "scanf.h" -#include "stdio.h" -#include "string.h" +#include "cstdio.h" +#include "cstring.h" #include "wchar_io.h" #define TARGET_FLOAT_BITS 64 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c index 1025b855fa..ccfd0550c0 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c @@ -1,4 +1,4 @@ -#include "string.h" +#include "cstring.h" #define K1 0x80808080 #define K2 0xFEFEFEFF diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c index 212dc341d1..cfc907320c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c @@ -1,7 +1,7 @@ #include "strtoul.h" #include "ctype.h" #include "errno.h" -#include "limits.h" +#include "climits.h" #include "scanf.h" enum scan_states { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c index d246b33d12..7e970a81d0 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c @@ -34,7 +34,7 @@ * Function needed: sqrt */ -#include "math.h" +#include "cmath.h" #ifdef __STDC__ static const double @@ -101,4 +101,4 @@ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ w = r*s+c; return 2.0*(df+w); } -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c index 3e73711aff..4058af145d 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c @@ -40,7 +40,7 @@ * */ -#include "math.h" +#include "cmath.h" #ifdef __STDC__ static const double @@ -112,4 +112,4 @@ double __ieee754_asin(x) double x; return t; else return -t; -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c index fb139480c6..59b8ffe201 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c @@ -112,7 +112,7 @@ #include "types.h" #include "errno.h" -#include "math.h" +#include "cmath.h" #ifndef _DOUBLE_IS_32BITS @@ -404,4 +404,4 @@ double __ieee754_pow(x, y) double x, y; #endif /* defined(_DOUBLE_IS_32BITS) */ -// EOF e_pow.c \ No newline at end of file +// EOF e_pow.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c index b179a8ee66..7902352ff5 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c @@ -17,7 +17,7 @@ * use __kernel_rem_pio2() */ -#include "math.h" +#include "cmath.h" /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi @@ -176,4 +176,4 @@ int __ieee754_rem_pio2(x, y) double x, y[]; return -n; } return n; -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c index 162bd7c284..b3db70acde 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c @@ -81,7 +81,7 @@ */ #include "errno.h" -#include "math.h" +#include "cmath.h" #ifdef __STDC__ static const double one = 1.0, tiny = 1.0e-300; @@ -458,4 +458,4 @@ B. sqrt(x) by Reciproot Iteration (4) Special cases (see (4) of Section A). - */ \ No newline at end of file + */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c index e90d19fde1..c7eb4edc5d 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c @@ -99,7 +99,7 @@ * = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y))) */ -#include "math.h" +#include "cmath.h" static const double one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ pio4 = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ pio4lo = 3.06161699786838301793e-17, /* 0x3C81A626, 0x33145C07 */ @@ -177,4 +177,4 @@ double __kernel_tan(double x, double y, int iy) } } -// EOF k_tan.c \ No newline at end of file +// EOF k_tan.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c index fb238872dd..de906d1ef4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c @@ -11,7 +11,7 @@ * ==================================================== */ -#include "math.h" /* for isfinite macro */ +#include "cmath.h" /* for isfinite macro */ static const double two54 @@ -55,4 +55,4 @@ double ldexp(double x, int n) k += 54; /* subnormal result */ __HI(x) = (hx & 0x800fffff) | (k << 20); return x * twom54; -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c index 85120d1a0b..2e1e641266 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c @@ -1,6 +1,6 @@ #include "ansi_fp.h" #include "ansi_fp.h" -#include "limits.h" +#include "climits.h" #include "float.h" static int __count_trailing_zerol(unsigned long x) { diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h b/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h index 7ec6b8f736..36b6f440dd 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h +++ b/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h @@ -1,7 +1,7 @@ #ifndef MWCPLUSLIB_H #define MWCPLUSLIB_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c index 5db5c5d080..badb510ee8 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c +++ b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c @@ -1,5 +1,5 @@ -#include "__va_arg.h" -#include +#include +#include #undef __va_arg diff --git a/src/SSystem/SComponent/c_math.cpp b/src/SSystem/SComponent/c_math.cpp index 38d6cbdff1..49866b3684 100644 --- a/src/SSystem/SComponent/c_math.cpp +++ b/src/SSystem/SComponent/c_math.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_m3d.h" -#include +#include s16 cM_rad2s(f32 rad) { s32 s = (std::fmod(rad, 2 * M_PI) * (0x8000 / M_PI)); diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c index 63fc445363..6bb12f9928 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c @@ -4,7 +4,6 @@ #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include #include "global.h" -#include "__ar.h" extern u32 _db_stack_addr; diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c index cc0f89a25d..094ec4c2bd 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c @@ -2,7 +2,7 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "trk.h" -#include +#include static BOOL IsTRKConnected; diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c index bef5bf5a7e..1afc4a68cc 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c @@ -1,7 +1,7 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/support.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h" -#include +#include DSError TRKSuppAccessFile(u32 file_handle, u8* data, size_t* count, DSIOResult* io_result, BOOL need_reply, BOOL read) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c index 5c7afeaced..76fef30a46 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c @@ -1,7 +1,7 @@ #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include -#include +#include typedef struct memRange { u8* start; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 45927b3f49..7e6762e02d 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -16,7 +16,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include "cmath.h" +#include enum B_bq_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index a6dcbf5e42..69eda8177a 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_tn.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_nbomb.h" diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index f8092cfa85..7d0516f467 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include enum Joint { /* 0x00 */ JNT_CENTER, diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index 21c814b1f9..426984d84b 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include int daB_ZANTM_c::draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 4bec7cbca0..16c0160a35 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -11,7 +11,7 @@ #include "d/d_cc_uty.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include namespace { dCcD_SrcSph cc_zant_src = { diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 49727d8cab..6b16768d0d 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" -#include "stdio.h" +#include #include "dolphin/os.h" #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index e27eb54b09..0290422504 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include +#include #define ACTION_MODE_WAIT 0 #define ACTION_MODE_CHASE 1 diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index a18ca69d99..d9e95a80b7 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" #include "d/d_bomb.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" class daE_SW_HIO_c { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 141c8ee117..11c74e8cfc 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -9,7 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include "cmath.h" +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 8708d5c321..ac4e851412 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_e_ws.h" #include "d/actor/d_a_obj_carry.h" -#include +#include #include "f_op/f_op_actor_enemy.h" class daE_WS_HIO_c : public JORReflexible { diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index a2db2014fa..a01a3f1981 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" struct daE_YMB_HIO_c { diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index ffca6690cd..73c2af65eb 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include #define ANM_HS_BACK_WALK 6 #define ANM_HS_WALK_START 7 diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index d6068ff672..501c036429 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_msg_object.h" -#include +#include #include "d/actor/d_a_balloon_2D.h" #include "d/actor/d_a_e_ym.h" diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 24c177007b..4d0b3c64a3 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -22,7 +22,7 @@ #include "c/c_damagereaction.h" #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include class dmg_rod_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 18011da632..4c4787c8b3 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -322,7 +322,7 @@ void dMirror_packet_c::mainDraw() { } f32 aspect = view->aspect; - f32 temp_f0_2 = i_tanf(MTXDegToRad(view->fovy * 0.5f)); + f32 temp_f0_2 = tanf(MTXDegToRad(view->fovy * 0.5f)); view_port_class* view_port = dComIfGd_getViewport(); f32 var_f3; diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 61212d3c96..846cc6b1a1 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_m3d_g_pla.h" #include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" -#include "cmath.h" +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_mg_fshop.h" diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index b6118f3af3..58b3433774 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" -#include +#include void daObjBhbridge_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 param_4) { cLib_addCalcAngleS(¶m_1, param_3 * (param_2 / param_4), 1, 0x100, 1); diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index b26e2d48dc..02dd9b8d92 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" -#include +#include #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_obj_swBallA.h" diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 06d96b3b45..0717bc4942 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -12,7 +12,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#include "cmath.h" +#include void daObjCwall_c::initBaseMtx() { mWallModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 318780b5e3..1fa9f10c73 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_digsnow.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include +#include void daObjDigSnow_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index e317b9cdfc..bf88385049 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_drop.h" #include "SSystem/SComponent/c_math.h" -#include "cmath.h" +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index 086487c869..36b2da6d0e 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1,7 +1,7 @@ #include "d/actor/d_a_obj_gra2.h" #include "d/d_camera.h" #include "d/actor/d_a_tag_gra.h" -#include +#include f32 daObj_GrA_c::getSrchCircleR() { f32 srchCircleR; diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 3e390e98d4..e3839c5c1b 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" #include "d/d_s_play.h" -#include +#include f32 dummyLiteral() { return 0.0f; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index da3c4778b5..326bb0b7c8 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -12,7 +12,7 @@ #include "d/d_s_play.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include +#include class daOBJ_ICE_S_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index e4ab3ac050..1a72f1b34b 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_npc_tk.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include #define PARTS_ALL 0x3FFFF #define PART_TOP_LEFT_UNDER (1 << 0) diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index a4cc3b7526..e039ff3417 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -95,7 +95,7 @@ void daObjLv4Chan_c::setMtxChain(daObjLv4Chan_c::ChainPos* i_chains, dMdl_obj_c* f32 dVar10 = VECDotProduct(&cStack_7c, &::cXyz::BaseZ); if (!cM3d_IsZero(cStack_88.getSquareMag()) && -1.0f <= dVar10 && dVar10 <= 1.0f) { cStack_88.normalize(); - f32 fVar11 = i_acosf(dVar10); + f32 fVar11 = acosf(dVar10); i_chains[i].field_0x24 = fVar11 - M_PI / 2; MTXRotAxisRad(afStack_70, &cStack_88, fVar11); } else { @@ -133,7 +133,7 @@ void daObjLv4Chan_c::setMtx() { f32 dVar9 = VECDotProduct(&local_78, &::cXyz::BaseY); if (!cM3d_IsZero(cStack_84.getSquareMag()) && -1.0f <= dVar9 && dVar9 <= 1.0f) { cStack_84.normalize(); - MTXRotAxisRad(afStack_68, &cStack_84, i_acosf(dVar9)); + MTXRotAxisRad(afStack_68, &cStack_84, acosf(dVar9)); local_78 *= -150.0f; } else { MTXIdentity(afStack_68); diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index e846622e57..1680da93f4 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_item.h" -#include +#include void daObjL4DigSand_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index 2938cbf4b7..e3a21183b5 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include "cmath.h" +#include #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index ba531cd92f..e177c63278 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" #include "d/d_item_data.h" -#include "cmath.h" +#include const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 54038f2b6e..36ff9973b6 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "global.h" #include "SSystem/SComponent/c_math.h" -#include "cmath.h" +#include const static int l_bmdIdx[2] = {3, 3}; diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 832b274748..024ed40ce3 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -#include "cmath.h" +#include static u32 const l_bmd[2] = { 4, 4, diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index aa9a5e0822..b3d1627306 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_kankyo_mng.h" -#include +#include static daWdStick_HIO_c l_HIO; diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index f9456a4c25..e13945e7ae 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_set_bgobj.h" -#include "stdio.h" +#include #include "f_op/f_op_actor_mng.h" static const char l_specName[] = "spec.dat"; diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index 20cc72700e..ca33e67b0c 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -1,7 +1,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_camera.h" -#include "cmath.h" +#include #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_horse.h" diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index 0aa8b7fdd0..f66cdb59e2 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_chkpoint.h" -#include +#include #include "d/actor/d_a_player.h" int daTag_Chk_c::execute() { diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index cafd66d876..02838ccdac 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_firewall.h" -#include "cmath.h" +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_bomb.h" diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 1309de896b..0ada92d5d8 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_sppath.h" #include "d/actor/d_a_player.h" -#include "math.h" +#include static dCcD_SrcCyl l_cylSrc = { { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index fcbdbd8c25..faed410404 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_camera_mng.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include static const f32 l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f }; diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index b41b5a4d87..91e9884f24 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -6,7 +6,7 @@ #include "d/d_bg_s_cap_poly.h" #include -#include +#include #include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "SSystem/SComponent/c_m2d.h" diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 0b4a9ba890..b6ca10750e 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3,7 +3,7 @@ #include "d/d_camera.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" -#include "cmath.h" +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_horse.h" @@ -21,7 +21,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include "math.h" +#include namespace { @@ -2111,10 +2111,10 @@ f32 dCamera_c::radiusActorInSight(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cX f32 local_12c = 1.0f; f32 local_130 = 1.0f; if (bVar2 & 5) { - local_12c = i_tanf(fVar7); + local_12c = tanf(fVar7); } if (bVar2 & 0xA) { - local_130 = i_tanf(fVar8); + local_130 = tanf(fVar8); } if (bVar2 & 1) { diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index bd451371c0..2f22a58de1 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -22,7 +22,7 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "stdio.h" +#include void dComIfG_play_c::ct() { mWindowNum = 0; diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 3620b8cf4f..794a663f61 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_tag_magne.h" #include "d/actor/d_a_tag_mist.h" #include "d/actor/d_a_tag_stream.h" -#include "stdio.h" +#include void daSus_c::data_c::set(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3, u8 param_4, u8 i_type) { diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 13302cafd0..5cf7749878 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -5,7 +5,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPicture.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 90c3110e0d..abe589b4c4 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -13,7 +13,7 @@ #include "d/d_demo.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if DEBUG static dEvM_HIO_c l_HIO; diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 97e27fcbe2..c723c99376 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" #include "d/d_pane_class_alpha.h" -#include "stdio.h" +#include dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { mArchive = i_archive; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 47fee86cc8..227a2b54ad 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -24,26 +24,12 @@ #include "f_op/f_op_kankyo.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" - -#if DEBUG -extern "C" int atoi(const char* str); -extern "C" f32 atof(const char* str); -#endif +#include static void GxXFog_set(); struct sub_kankyo__class : public kankyo_class {}; -// setSunpos calls these functions as inlines somehow -// these need to be moved to MSL_C once an appropriate solution is found -inline float sinf(float x) { - return sin(x); -} - -inline float cosf(float x) { - return cos(x); -} - static LightStatus lightStatusBase = { {-36384.5f, 29096.699f, 17422.199f}, {377.0f, 5207.3999f, 1220.4f}, diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 0676ae8ec2..4b740c6652 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -4528,16 +4528,6 @@ void drawCloudShadow(Mtx drawMtx, u8** tex) { } } -// drawVrkumo calls these functions as inlines somehow -// these need to be moved to MSL_C once an appropriate solution is found -inline float sinf(float x) { - return sin(x); -} - -inline float cosf(float x) { - return cos(x); -} - void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket; dScnKy_env_light_c* envlight = dKy_getEnvlight(); diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp index 9043a5657e..80278dda50 100644 --- a/src/d/d_menu_dmap_map.cpp +++ b/src/d/d_menu_dmap_map.cpp @@ -4,7 +4,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "d/d_com_inf_game.h" #include "d/d_map_path_dmap.h" #include "d/d_menu_dmap.h" diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 8827242e73..bfe946f726 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "stdio.h" +#include #include "f_op/f_op_msg_mng.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 11de75c964..6b847ef8ee 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -19,7 +19,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "stdio.h" +#include typedef void (dMenu_Insect_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index edf85dcd11..8ef451074a 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -9,7 +9,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTTexture.h" -#include "stdio.h" +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index 86afe871b5..65abead063 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "stdio.h" +#include #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index d1c1d452cb..48747da384 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -27,7 +27,7 @@ #include "m_Do/m_Do_graphic.h" #include "string.h" -#include "stdio.h" +#include typedef void (dMenu_Ring_c::*initFunc)(); static initFunc stick_init[] = { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 0c2f0bc332..1faa35b2ed 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -3,7 +3,7 @@ #include "d/d_menu_save.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "stdio.h" +#include #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index f97608cc18..aed3bf7fe1 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -20,7 +20,7 @@ #include "d/d_msg_class.h" #include "d/d_msg_object.h" #include "d/d_pane_class.h" -#include "cstring.h" +#include "string.h" dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n"); diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 9f078e0065..42301e6507 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -22,7 +22,7 @@ #include "d/d_meter2.h" #include "d/actor/d_a_midna.h" #include "f_op/f_op_msg_mng.h" -#include "stdio.h" +#include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index 0c6ca29e81..bfd268aab6 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -10,7 +10,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" -#include "cstring.h" +#include "string.h" #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_msg_object.h" diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp index ab1f4484ca..11bbadf7c5 100644 --- a/src/d/d_msg_scrn_base.cpp +++ b/src/d/d_msg_scrn_base.cpp @@ -6,7 +6,7 @@ #include "d/d_msg_object.h" #include "d/d_msg_out_font.h" #include "d/d_pane_class.h" -#include "cstring.h" +#include "string.h" dMsgScrnBase_c::dMsgScrnBase_c() { init(); diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index be5ce1f4a2..8ffd59b5de 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -11,7 +11,7 @@ #include "d/d_msg_string.h" #include "d/d_pane_class.h" #include "m_Do/m_Do_controller_pad.h" -#include "stdio.h" +#include #if VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 9e641220c8..1b1dfcad4a 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -2,7 +2,7 @@ #include "d/d_msg_unit.h" #include "d/d_com_inf_game.h" -#include "stdio.h" +#include #include "d/d_kankyo.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 81afdfd48a..9dcb14d00a 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -6,7 +6,7 @@ #include "d/d_lib.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_controller_pad.h" -#include "stdio.h" +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index a53af78ae9..bd1c524b8b 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -17,7 +17,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JMath/JMATrigonometric.h" #include "d/d_s_play.h" -#include "stdio.h" +#include #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 0955876024..6f8ef0d3f3 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -19,11 +19,9 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTReport.h" -#include +#include #if DEBUG -extern "C" int atoi(const char* str); - void dScnMenu_setItem(int i_slotNo, u8 i_itemNo); void dScnMenu_setPlayerDebugMode(); void dScnMenu_setPlayerItemReset(); diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 84f8bf1204..46c4ac3b67 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -10,7 +10,7 @@ #include "d/d_s_play.h" #include "d/d_s_room.h" #include "m_Do/m_Do_Reset.h" -#include "stdio.h" +#include static int dScnRoom_Draw(room_of_scene_class* i_this) { return 1; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index bc82bb05d1..f5ecb91470 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -13,7 +13,11 @@ #include "d/d_save.h" #include "d/d_save_init.h" #include "f_op/f_op_scene_mng.h" -#include "stdio.h" +#include + +#if PLATFORM_WII || PLATFORM_SHIELD +#include +#endif #if VERSION == VERSION_SHIELD #include "lingcod/lingcod.h" @@ -967,8 +971,6 @@ void dSv_player_info_c::init() { } } -extern "C" u8 SCGetLanguage(); - void dSv_player_config_c::init() { #if VERSION == VERSION_GCN_JPN unk0 = 0; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 55f2b24244..d323df4abf 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -17,7 +17,7 @@ #include "f_op/f_op_scene_mng.h" #include "global.h" #include "m_Do/m_Do_Reset.h" -#include "stdio.h" +#include void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, u8 i_speed) { diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index b0d80c85b8..6b5a96362d 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -5,7 +5,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "SSystem/SComponent/c_math.h" -#include +#include #define RESET_FRAME -99 diff --git a/src/dolphin/G2D/G2D.c b/src/dolphin/G2D/G2D.c index 92302f4ef9..f34c0d4136 100644 --- a/src/dolphin/G2D/G2D.c +++ b/src/dolphin/G2D/G2D.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" static G2DGlob glob; diff --git a/src/dolphin/ar/ar.c b/src/dolphin/ar/ar.c index 5f5d6b1b60..c76acd2e71 100644 --- a/src/dolphin/ar/ar.c +++ b/src/dolphin/ar/ar.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__ar.h" diff --git a/src/dolphin/ax/AXVPB.c b/src/dolphin/ax/AXVPB.c index 6bf7f4ae6e..e8cf663470 100644 --- a/src/dolphin/ax/AXVPB.c +++ b/src/dolphin/ax/AXVPB.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__ax.h" diff --git a/src/dolphin/axart/axartlpf.c b/src/dolphin/axart/axartlpf.c index c2aecfa9f8..107ce3f4ea 100644 --- a/src/dolphin/axart/axartlpf.c +++ b/src/dolphin/axart/axartlpf.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" static u16 __coefs[48] = { 0x6A09, 0x15F6, 0x6871, 0x178E, 0x6463, 0x1B9C, diff --git a/src/dolphin/axfx/reverb_hi.c b/src/dolphin/axfx/reverb_hi.c index 44f8d3c04e..21cb3bfc50 100644 --- a/src/dolphin/axfx/reverb_hi.c +++ b/src/dolphin/axfx/reverb_hi.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__axfx.h" diff --git a/src/dolphin/axfx/reverb_hi_4ch.c b/src/dolphin/axfx/reverb_hi_4ch.c index f7770c9959..22cef85079 100644 --- a/src/dolphin/axfx/reverb_hi_4ch.c +++ b/src/dolphin/axfx/reverb_hi_4ch.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__axfx.h" diff --git a/src/dolphin/axfx/reverb_std.c b/src/dolphin/axfx/reverb_std.c index ef74a8d1e7..2261b3424c 100644 --- a/src/dolphin/axfx/reverb_std.c +++ b/src/dolphin/axfx/reverb_std.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__axfx.h" diff --git a/src/dolphin/card/CARDUnlock.c b/src/dolphin/card/CARDUnlock.c index 63313c5098..124e0c2069 100644 --- a/src/dolphin/card/CARDUnlock.c +++ b/src/dolphin/card/CARDUnlock.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/demo/DEMOAVX.c b/src/dolphin/demo/DEMOAVX.c index 927c09661c..39f5d8f554 100644 --- a/src/dolphin/demo/DEMOAVX.c +++ b/src/dolphin/demo/DEMOAVX.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" static s16 __AVX_internal_buffer[3200] ATTRIBUTE_ALIGN(32); diff --git a/src/dolphin/dsp/dsp.c b/src/dolphin/dsp/dsp.c index 2737aaa229..085cde1f6d 100644 --- a/src/dolphin/dsp/dsp.c +++ b/src/dolphin/dsp/dsp.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/dsp/dsp_task.c b/src/dolphin/dsp/dsp_task.c index 236950cddf..b1651a0de3 100644 --- a/src/dolphin/dsp/dsp_task.c +++ b/src/dolphin/dsp/dsp_task.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gd/GDLight.c b/src/dolphin/gd/GDLight.c index 96e08a447d..b96b7ac264 100644 --- a/src/dolphin/gd/GDLight.c +++ b/src/dolphin/gd/GDLight.c @@ -1,5 +1,5 @@ #include -#include +#include void GDSetLightAttn(GXLightID light, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1, f32 k2) { GDWriteXFCmdHdr(__GDLightID2Offset(light) + XF_LIGHT_ATTN_ID, 6); diff --git a/src/dolphin/gx/GXDisplayList.c b/src/dolphin/gx/GXDisplayList.c index 667b31df40..356cfcb4a9 100644 --- a/src/dolphin/gx/GXDisplayList.c +++ b/src/dolphin/gx/GXDisplayList.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXDraw.c b/src/dolphin/gx/GXDraw.c index 0ea0d0beb5..a8ec028127 100644 --- a/src/dolphin/gx/GXDraw.c +++ b/src/dolphin/gx/GXDraw.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXFifo.c b/src/dolphin/gx/GXFifo.c index 1085da461b..8acdac3688 100644 --- a/src/dolphin/gx/GXFifo.c +++ b/src/dolphin/gx/GXFifo.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/dolphin/gx/GXGeometry.c b/src/dolphin/gx/GXGeometry.c index b41b70be23..cbd7a19c40 100644 --- a/src/dolphin/gx/GXGeometry.c +++ b/src/dolphin/gx/GXGeometry.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXInit.c b/src/dolphin/gx/GXInit.c index 53f7f0cc1a..aceef9f9b5 100644 --- a/src/dolphin/gx/GXInit.c +++ b/src/dolphin/gx/GXInit.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXLight.c b/src/dolphin/gx/GXLight.c index 78418c02c2..51928937ba 100644 --- a/src/dolphin/gx/GXLight.c +++ b/src/dolphin/gx/GXLight.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXMisc.c b/src/dolphin/gx/GXMisc.c index 3c30698560..2138303882 100644 --- a/src/dolphin/gx/GXMisc.c +++ b/src/dolphin/gx/GXMisc.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/dolphin/gx/GXPixel.c b/src/dolphin/gx/GXPixel.c index 027276cf0a..4e4be47c8c 100644 --- a/src/dolphin/gx/GXPixel.c +++ b/src/dolphin/gx/GXPixel.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXTexture.c b/src/dolphin/gx/GXTexture.c index ba5829901a..8efb2ec06c 100644 --- a/src/dolphin/gx/GXTexture.c +++ b/src/dolphin/gx/GXTexture.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__gx.h" diff --git a/src/dolphin/gx/GXVerifRAS.c b/src/dolphin/gx/GXVerifRAS.c index f1aa96678b..4492385851 100644 --- a/src/dolphin/gx/GXVerifRAS.c +++ b/src/dolphin/gx/GXVerifRAS.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/dolphin/gx/GXVerifXF.c b/src/dolphin/gx/GXVerifXF.c index 1e45aabdb8..70498a3fdd 100644 --- a/src/dolphin/gx/GXVerifXF.c +++ b/src/dolphin/gx/GXVerifXF.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/dolphin/mtx/mtx.c b/src/dolphin/mtx/mtx.c index 888246b1f1..82adf3dc12 100644 --- a/src/dolphin/mtx/mtx.c +++ b/src/dolphin/mtx/mtx.c @@ -1,6 +1,6 @@ #include #include -#include +#include static f32 Unit01[2] = { 0.0f, diff --git a/src/dolphin/mtx/mtx44.c b/src/dolphin/mtx/mtx44.c index 8c6526833b..669bfa5806 100644 --- a/src/dolphin/mtx/mtx44.c +++ b/src/dolphin/mtx/mtx44.c @@ -1,6 +1,6 @@ #include #include -#include +#include static f32 mtxUnit[] = {0.0f, 1.0f, 0.5f, 3.0f}; diff --git a/src/dolphin/mtx/mtx44vec.c b/src/dolphin/mtx/mtx44vec.c index 19b03894a7..a27034aa40 100644 --- a/src/dolphin/mtx/mtx44vec.c +++ b/src/dolphin/mtx/mtx44vec.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" void C_MTX44MultVec(const Mtx44 m, const Vec* src, Vec* dst) { Vec vTmp; diff --git a/src/dolphin/mtx/mtxstack.c b/src/dolphin/mtx/mtxstack.c index 5502b2e9d4..37fd9b3ca7 100644 --- a/src/dolphin/mtx/mtxstack.c +++ b/src/dolphin/mtx/mtxstack.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" void MTXInitStack(MTXStack* sPtr, u32 numMtx) { ASSERTMSGLINE(74, sPtr, "MTXInitStack(): NULL MtxStackPtr 'sPtr' "); diff --git a/src/dolphin/mtx/mtxvec.c b/src/dolphin/mtx/mtxvec.c index 61cb3ae6ad..0d62e36469 100644 --- a/src/dolphin/mtx/mtxvec.c +++ b/src/dolphin/mtx/mtxvec.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_MTXMultVec(const Mtx m, const Vec* src, Vec* dst) { Vec vTmp; diff --git a/src/dolphin/mtx/psmtx.c b/src/dolphin/mtx/psmtx.c index cc75ea8b3d..fb2a5bf419 100644 --- a/src/dolphin/mtx/psmtx.c +++ b/src/dolphin/mtx/psmtx.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" asm void PSMTXReorder(const __REGISTER Mtx src, __REGISTER ROMtx dest) { psq_l f0, 0(src), 0, 0 diff --git a/src/dolphin/mtx/quat.c b/src/dolphin/mtx/quat.c index cf00deb3df..e5dd44855a 100644 --- a/src/dolphin/mtx/quat.c +++ b/src/dolphin/mtx/quat.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_QUATAdd(const Quaternion* p, const Quaternion* q, Quaternion* r) { ASSERTMSGLINE(77, p, "QUATAdd(): NULL QuaternionPtr 'p' "); diff --git a/src/dolphin/mtx/vec.c b/src/dolphin/mtx/vec.c index c501097268..c07de9a61e 100644 --- a/src/dolphin/mtx/vec.c +++ b/src/dolphin/mtx/vec.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_VECAdd(const Vec* a, const Vec* b, Vec* ab) { ASSERTMSGLINE(108, a, "VECAdd(): NULL VecPtr 'a' "); diff --git a/src/dolphin/os/OSError.c b/src/dolphin/os/OSError.c index f01258fca2..8e0ff3dce5 100644 --- a/src/dolphin/os/OSError.c +++ b/src/dolphin/os/OSError.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/os/__ppc_eabi_init.c b/src/dolphin/os/__ppc_eabi_init.c index 9c0054a4c7..5aef392edc 100644 --- a/src/dolphin/os/__ppc_eabi_init.c +++ b/src/dolphin/os/__ppc_eabi_init.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/pad/Padclamp.c b/src/dolphin/pad/Padclamp.c index 960e38880c..ee9e1561b4 100644 --- a/src/dolphin/pad/Padclamp.c +++ b/src/dolphin/pad/Padclamp.c @@ -1,4 +1,4 @@ -#include "fake_tgmath.h" +#include "sdk_math.h" #include #include diff --git a/src/dolphin/perf/perf.c b/src/dolphin/perf/perf.c index a5529239bb..fdb380c885 100644 --- a/src/dolphin/perf/perf.c +++ b/src/dolphin/perf/perf.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__perf.h" #include "../gx/__gx.h" diff --git a/src/dolphin/perf/perfdraw.c b/src/dolphin/perf/perfdraw.c index 2e23517082..87a8813dea 100644 --- a/src/dolphin/perf/perfdraw.c +++ b/src/dolphin/perf/perfdraw.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__perf.h" diff --git a/src/dolphin/syn/syn.c b/src/dolphin/syn/syn.c index 8dd2771166..8005f11b8a 100644 --- a/src/dolphin/syn/syn.c +++ b/src/dolphin/syn/syn.c @@ -3,7 +3,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synctrl.c b/src/dolphin/syn/synctrl.c index 8c96fb8368..1a97a18f8d 100644 --- a/src/dolphin/syn/synctrl.c +++ b/src/dolphin/syn/synctrl.c @@ -2,7 +2,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synenv.c b/src/dolphin/syn/synenv.c index 7d7f15fe8a..5e27c97ab2 100644 --- a/src/dolphin/syn/synenv.c +++ b/src/dolphin/syn/synenv.c @@ -1,8 +1,8 @@ #include #include #include -#include "fake_tgmath.h" -#include "cmath.h" +#include "sdk_math.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synlfo.c b/src/dolphin/syn/synlfo.c index 9625c3b176..83d8bfab85 100644 --- a/src/dolphin/syn/synlfo.c +++ b/src/dolphin/syn/synlfo.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synmix.c b/src/dolphin/syn/synmix.c index bfa9fdd49a..240ffb89b4 100644 --- a/src/dolphin/syn/synmix.c +++ b/src/dolphin/syn/synmix.c @@ -2,7 +2,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synpitch.c b/src/dolphin/syn/synpitch.c index ce38a83114..e493239345 100644 --- a/src/dolphin/syn/synpitch.c +++ b/src/dolphin/syn/synpitch.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synsample.c b/src/dolphin/syn/synsample.c index e1c1f05ac1..d7cadcb55d 100644 --- a/src/dolphin/syn/synsample.c +++ b/src/dolphin/syn/synsample.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synvoice.c b/src/dolphin/syn/synvoice.c index ec6ea4437b..d2fa1bbe09 100644 --- a/src/dolphin/syn/synvoice.c +++ b/src/dolphin/syn/synvoice.c @@ -2,7 +2,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synwt.c b/src/dolphin/syn/synwt.c index 8b29c511a8..d1f6bcf46b 100644 --- a/src/dolphin/syn/synwt.c +++ b/src/dolphin/syn/synwt.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 4cba9026ba..b1c6ab26ce 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -21,7 +21,7 @@ #include "global.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "stdio.h" +#include static void mDoExt_setJ3DData(Mtx mtx, const J3DTransformInfo* transformInfo, u16 param_2) { bool local_28; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 2962ed5a88..53f955b453 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -33,7 +33,7 @@ #include "m_Do/m_Do_printf.h" #include "m_Do/m_Do_ext2.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 70b15a7238..3f6ca18008 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -4,7 +4,7 @@ */ #include "m_Do/m_Do_printf.h" -#include "stdio.h" +#include #include #include "m_Do/m_Do_ext.h" diff --git a/src/revolution/aralt/aralt.c b/src/revolution/aralt/aralt.c index 8dfd3e2139..1ec72ba63f 100644 --- a/src/revolution/aralt/aralt.c +++ b/src/revolution/aralt/aralt.c @@ -1,8 +1,8 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" -#include +#include #include "__ar.h" diff --git a/src/revolution/card/CARDUnlock.c b/src/revolution/card/CARDUnlock.c index 63313c5098..124e0c2069 100644 --- a/src/revolution/card/CARDUnlock.c +++ b/src/revolution/card/CARDUnlock.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dsp/dsp.c b/src/revolution/dsp/dsp.c index a023089b59..f7c03c9cc9 100644 --- a/src/revolution/dsp/dsp.c +++ b/src/revolution/dsp/dsp.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dsp/dsp_task.c b/src/revolution/dsp/dsp_task.c index 7ea99ba8e6..fb1455477f 100644 --- a/src/revolution/dsp/dsp_task.c +++ b/src/revolution/dsp/dsp_task.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dvd/dvd.c b/src/revolution/dvd/dvd.c index d000b71429..13b692f260 100644 --- a/src/revolution/dvd/dvd.c +++ b/src/revolution/dvd/dvd.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include "os/__os.h" #include "__dvd.h" diff --git a/src/revolution/dvd/dvdidutils.c b/src/revolution/dvd/dvdidutils.c index 2742086b58..e08209f021 100644 --- a/src/revolution/dvd/dvdidutils.c +++ b/src/revolution/dvd/dvdidutils.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__dvd.h" diff --git a/src/revolution/fs/fs.c b/src/revolution/fs/fs.c index 5ea6eecd54..bf3af1a1da 100644 --- a/src/revolution/fs/fs.c +++ b/src/revolution/fs/fs.c @@ -1,6 +1,6 @@ #include #include -#include +#include static IOSFd __fsFd = -1; static u32 __fsInitialized = FALSE; diff --git a/src/revolution/gd/GDLight.c b/src/revolution/gd/GDLight.c index 15e6a64233..a1c038a5f2 100644 --- a/src/revolution/gd/GDLight.c +++ b/src/revolution/gd/GDLight.c @@ -1,5 +1,5 @@ #include -#include +#include void GDSetLightAttn(GXLightID light, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1, f32 k2) { GDWriteXFCmdHdr(__GDLightID2Offset(light) + XF_LIGHT_ATTN_ID, 6); diff --git a/src/revolution/gx/GXDisplayList.c b/src/revolution/gx/GXDisplayList.c index 747f9749bf..50d4a6d339 100644 --- a/src/revolution/gx/GXDisplayList.c +++ b/src/revolution/gx/GXDisplayList.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXDraw.c b/src/revolution/gx/GXDraw.c index 30557b0dc6..f9cb1d4c68 100644 --- a/src/revolution/gx/GXDraw.c +++ b/src/revolution/gx/GXDraw.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXGeometry.c b/src/revolution/gx/GXGeometry.c index f585938fa1..a7c00a4483 100644 --- a/src/revolution/gx/GXGeometry.c +++ b/src/revolution/gx/GXGeometry.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXInit.c b/src/revolution/gx/GXInit.c index e7ecba2b8b..50b5d4026d 100644 --- a/src/revolution/gx/GXInit.c +++ b/src/revolution/gx/GXInit.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXLight.c b/src/revolution/gx/GXLight.c index b371eb1fae..48d8da5b37 100644 --- a/src/revolution/gx/GXLight.c +++ b/src/revolution/gx/GXLight.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXMisc.c b/src/revolution/gx/GXMisc.c index 46980ceeb4..fe757ab0f7 100644 --- a/src/revolution/gx/GXMisc.c +++ b/src/revolution/gx/GXMisc.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/revolution/gx/GXPixel.c b/src/revolution/gx/GXPixel.c index a68a119305..cb3f9ce051 100644 --- a/src/revolution/gx/GXPixel.c +++ b/src/revolution/gx/GXPixel.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXTexture.c b/src/revolution/gx/GXTexture.c index 532294078b..97abcfda02 100644 --- a/src/revolution/gx/GXTexture.c +++ b/src/revolution/gx/GXTexture.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__gx.h" diff --git a/src/revolution/gx/GXVerifRAS.c b/src/revolution/gx/GXVerifRAS.c index cdb935069b..190647818e 100644 --- a/src/revolution/gx/GXVerifRAS.c +++ b/src/revolution/gx/GXVerifRAS.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/revolution/gx/GXVerifXF.c b/src/revolution/gx/GXVerifXF.c index 8784888afd..ec2cde4f6d 100644 --- a/src/revolution/gx/GXVerifXF.c +++ b/src/revolution/gx/GXVerifXF.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp index a940cd5483..a1a86b1603 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp @@ -5,7 +5,7 @@ #include "pane.h" #include "new.h" -#include +#include namespace { // pretend this is nw4hbm::lyt diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp index 7b87676dce..9e26b3bdb4 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp @@ -2,7 +2,7 @@ #include "layout.h" -#include +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp index a9e8932053..ab04812226 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp @@ -1,6 +1,6 @@ #include "drawInfo.h" -#include +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp index 727498c328..ef44a5abab 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp @@ -3,7 +3,7 @@ #include "common.h" #include "layout.h" -#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp index ce5f620b29..ac44e57e51 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp @@ -6,7 +6,7 @@ #include -#include +#include static const GXColorS10 DefaultBlackColor = {0, 0, 0, 0}; diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp index 68d086334d..a56cf35c0f 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp @@ -3,7 +3,7 @@ #include "common.h" #include "layout.h" -#include +#include namespace { // pretend this is nw4hbm::lyt diff --git a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h index edec2fc1e5..5a7485eb0a 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h @@ -2,7 +2,7 @@ #define NW4HBM_MATH_ARITHMETIC_H #include -#include +#include #include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h index 3a96e81205..f260a5ceeb 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h @@ -2,7 +2,7 @@ #define NW4HBM_MATH_TRIANGULAR_H #include -#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h b/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h index 3ac1890723..65ac357af8 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h @@ -4,7 +4,7 @@ #include #include #include "DisposeCallbackManager.h" -#include "limits.h" +#include "climits.h" #include "snd_global.h" #include "snd_types.h" diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h b/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h index 4d842a64f7..49185de63d 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h @@ -1,7 +1,7 @@ #ifndef NW4HBM_SND_CHANNEL_H #define NW4HBM_SND_CHANNEL_H -#include // USHRT_MAX +#include // USHRT_MAX #include diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h b/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h index f6aa2fa059..751d69846b 100644 --- a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h +++ b/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h @@ -6,7 +6,7 @@ #include "inlines.h" #include "../db/assert.h" -#include "stddef.h" +#include namespace nw4hbm { namespace ut { diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h index 7d24112e84..fc21259462 100644 --- a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h +++ b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h @@ -6,7 +6,7 @@ #include "CharWriter.h" #include "Rect.h" -#include +#include #include #include "TagProcessorBase.h" diff --git a/src/revolution/homebuttonLib/sound/synenv.cpp b/src/revolution/homebuttonLib/sound/synenv.cpp index 2e7c27d8f9..ec524ec197 100644 --- a/src/revolution/homebuttonLib/sound/synenv.cpp +++ b/src/revolution/homebuttonLib/sound/synenv.cpp @@ -1,7 +1,7 @@ #include "synprivate.h" -#include +#include #include #include diff --git a/src/revolution/ipc/ipcProfile.c b/src/revolution/ipc/ipcProfile.c index 60bf758a75..ff963a44e5 100644 --- a/src/revolution/ipc/ipcProfile.c +++ b/src/revolution/ipc/ipcProfile.c @@ -1,5 +1,5 @@ #include -#include +#include static u32 IpcReqPtrArray[96] = {0}; static u32 IpcReqArray[0x300] = {0}; diff --git a/src/revolution/ipc/ipcclt.c b/src/revolution/ipc/ipcclt.c index 39bc8b2f69..36cd1c1ada 100644 --- a/src/revolution/ipc/ipcclt.c +++ b/src/revolution/ipc/ipcclt.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include /* macro for matching __ipcQueueRequest */ #define diff(a, b) \ diff --git a/src/revolution/mtx/mtx.c b/src/revolution/mtx/mtx.c index 5388c29669..0660061145 100644 --- a/src/revolution/mtx/mtx.c +++ b/src/revolution/mtx/mtx.c @@ -1,6 +1,6 @@ #include #include -#include +#include static f32 Unit01[2] = { 0.0f, diff --git a/src/revolution/mtx/mtx44.c b/src/revolution/mtx/mtx44.c index 3cfedb61b3..e4e2b51332 100644 --- a/src/revolution/mtx/mtx44.c +++ b/src/revolution/mtx/mtx44.c @@ -1,6 +1,6 @@ #include #include -#include +#include f32 mtxUnit[] = {0.0f, 1.0f, 0.5f, 3.0f}; diff --git a/src/revolution/mtx/mtx44vec.c b/src/revolution/mtx/mtx44vec.c index da92c17ea7..cd58cb55df 100644 --- a/src/revolution/mtx/mtx44vec.c +++ b/src/revolution/mtx/mtx44vec.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" void C_MTX44MultVec(const Mtx44 m, const Vec* src, Vec* dst) { Vec vTmp; diff --git a/src/revolution/mtx/mtxstack.c b/src/revolution/mtx/mtxstack.c index af7956f4f7..d9ea8f3d90 100644 --- a/src/revolution/mtx/mtxstack.c +++ b/src/revolution/mtx/mtxstack.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" void MTXInitStack(MTXStack* sPtr, u32 numMtx) { ASSERTMSGLINE(74, sPtr, "MTXInitStack(): NULL MtxStackPtr 'sPtr' "); diff --git a/src/revolution/mtx/mtxvec.c b/src/revolution/mtx/mtxvec.c index 99c5a71a75..7cd8d5a11e 100644 --- a/src/revolution/mtx/mtxvec.c +++ b/src/revolution/mtx/mtxvec.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_MTXMultVec(const Mtx m, const Vec* src, Vec* dst) { Vec vTmp; diff --git a/src/revolution/mtx/psmtx.c b/src/revolution/mtx/psmtx.c index ab9aac13db..01af03ed45 100644 --- a/src/revolution/mtx/psmtx.c +++ b/src/revolution/mtx/psmtx.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" asm void PSMTXReorder(const __REGISTER Mtx src, __REGISTER ROMtx dest) { psq_l f0, 0(src), 0, 0 diff --git a/src/revolution/mtx/quat.c b/src/revolution/mtx/quat.c index 14964d9bfb..e1ed76de74 100644 --- a/src/revolution/mtx/quat.c +++ b/src/revolution/mtx/quat.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_QUATAdd(const Quaternion* p, const Quaternion* q, Quaternion* r) { ASSERTMSGLINE(77, p, "QUATAdd(): NULL QuaternionPtr 'p' "); diff --git a/src/revolution/mtx/vec.c b/src/revolution/mtx/vec.c index d2ef0675a1..12595bf5ab 100644 --- a/src/revolution/mtx/vec.c +++ b/src/revolution/mtx/vec.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_VECAdd(const Vec* a, const Vec* b, Vec* ab) { ASSERTMSGLINE(114, a, "VECAdd(): NULL VecPtr 'a' "); diff --git a/src/revolution/nand/NANDCore.c b/src/revolution/nand/NANDCore.c index 575ebecb40..35235c0b3f 100644 --- a/src/revolution/nand/NANDCore.c +++ b/src/revolution/nand/NANDCore.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #ifdef SDK_AUG2010 #define BUILD_DATE "Aug 23 2010" diff --git a/src/revolution/nand/NANDLogging.c b/src/revolution/nand/NANDLogging.c index 7d0d862c81..3106fde878 100644 --- a/src/revolution/nand/NANDLogging.c +++ b/src/revolution/nand/NANDLogging.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include static IOSFd s_fd = -255; diff --git a/src/revolution/nand/nand.c b/src/revolution/nand/nand.c index c81f226f84..8e445ca37c 100644 --- a/src/revolution/nand/nand.c +++ b/src/revolution/nand/nand.c @@ -2,7 +2,7 @@ #include #include -#include +#include static BOOL nandInspectPermission(u8); static void nandSplitPerm(u8, u32*, u32*, u32*); diff --git a/src/revolution/os/OS.c b/src/revolution/os/OS.c index 006870ca43..57872a3b0e 100644 --- a/src/revolution/os/OS.c +++ b/src/revolution/os/OS.c @@ -9,7 +9,7 @@ #include "__os.h" #include "__dvd.h" -#include +#include #define NOP 0x60000000 diff --git a/src/revolution/os/OSAudioSystem.c b/src/revolution/os/OSAudioSystem.c index a16bf21954..a426d869d1 100644 --- a/src/revolution/os/OSAudioSystem.c +++ b/src/revolution/os/OSAudioSystem.c @@ -1,7 +1,7 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSError.c b/src/revolution/os/OSError.c index c3698d1533..771dc4f661 100644 --- a/src/revolution/os/OSError.c +++ b/src/revolution/os/OSError.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/os/OSExec.c b/src/revolution/os/OSExec.c index 50441daab8..35bdc46f6b 100644 --- a/src/revolution/os/OSExec.c +++ b/src/revolution/os/OSExec.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "__os.h" #include "__dvd.h" diff --git a/src/revolution/os/OSFatal.c b/src/revolution/os/OSFatal.c index 0f7dae7555..cc395e090a 100644 --- a/src/revolution/os/OSFatal.c +++ b/src/revolution/os/OSFatal.c @@ -4,7 +4,7 @@ #include #include "__os.h" -#include +#include typedef struct OSFatalParam { GXColor fg; diff --git a/src/revolution/os/OSInterrupt.c b/src/revolution/os/OSInterrupt.c index 6250a07300..939e943533 100644 --- a/src/revolution/os/OSInterrupt.c +++ b/src/revolution/os/OSInterrupt.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSLaunch.c b/src/revolution/os/OSLaunch.c index 77bc9f8572..8165e04f11 100644 --- a/src/revolution/os/OSLaunch.c +++ b/src/revolution/os/OSLaunch.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSLink.c b/src/revolution/os/OSLink.c index 4abc2f64c2..ec3bde8938 100644 --- a/src/revolution/os/OSLink.c +++ b/src/revolution/os/OSLink.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSPlayTime.c b/src/revolution/os/OSPlayTime.c index 78a10b2ca8..16fcb7938c 100644 --- a/src/revolution/os/OSPlayTime.c +++ b/src/revolution/os/OSPlayTime.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSReset.c b/src/revolution/os/OSReset.c index 1685475a18..e3ac6c5c52 100644 --- a/src/revolution/os/OSReset.c +++ b/src/revolution/os/OSReset.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "__os.h" #include "__dvd.h" diff --git a/src/revolution/os/OSStateFlags.c b/src/revolution/os/OSStateFlags.c index da4b199cd5..959949fab5 100644 --- a/src/revolution/os/OSStateFlags.c +++ b/src/revolution/os/OSStateFlags.c @@ -1,6 +1,6 @@ #include #include -#include +#include static OSStateFlags StateFlags ATTRIBUTE_ALIGN(32); diff --git a/src/revolution/os/OSSync.c b/src/revolution/os/OSSync.c index 094efbe1ba..e21499a765 100644 --- a/src/revolution/os/OSSync.c +++ b/src/revolution/os/OSSync.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSTime.c b/src/revolution/os/OSTime.c index a7c2538160..7d7ce67fa0 100644 --- a/src/revolution/os/OSTime.c +++ b/src/revolution/os/OSTime.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/pad/Pad.c b/src/revolution/pad/Pad.c index 81105f2b8f..e887b188d1 100644 --- a/src/revolution/pad/Pad.c +++ b/src/revolution/pad/Pad.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "__si.h" diff --git a/src/revolution/sc/scapi_prdinfo.c b/src/revolution/sc/scapi_prdinfo.c index 820d24a4be..862666d428 100644 --- a/src/revolution/sc/scapi_prdinfo.c +++ b/src/revolution/sc/scapi_prdinfo.c @@ -1,6 +1,6 @@ #include #include -#include +#include typedef struct { s8 area; diff --git a/src/revolution/sc/scsystem.c b/src/revolution/sc/scsystem.c index 9ddc1fb5c1..21e090c5db 100644 --- a/src/revolution/sc/scsystem.c +++ b/src/revolution/sc/scsystem.c @@ -1,6 +1,6 @@ #include #include -#include +#include // #include #ifdef SDK_AUG2010 diff --git a/src/revolution/wenc/wenc.c b/src/revolution/wenc/wenc.c index 570106c1e8..a30c7b7c13 100644 --- a/src/revolution/wenc/wenc.c +++ b/src/revolution/wenc/wenc.c @@ -1,5 +1,5 @@ #include -#include +#include typedef struct { s32 nXN; // size 0x04, offset 0x00 diff --git a/src/revolution/wpad/WPAD.c b/src/revolution/wpad/WPAD.c index 27ca0b8559..af5cc1d99c 100644 --- a/src/revolution/wpad/WPAD.c +++ b/src/revolution/wpad/WPAD.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "__wpad.h"