Skip to content

Commit

Permalink
setjmp/longjmp, objects.json tidy, Debug work, Timer work (#273)
Browse files Browse the repository at this point in the history 
* Adjust some library naming/structuring in objects.json; add some placeholders

* arith and rand are matching, but weren't marked as such

* Remove `src` directory from SDK/lib split paths for brevity

* Fix location of Runtime folder in `sdk`

* Fix SoundTouch.cpp includes

* setjmp/longjmp

* Define TheDebugJump

* MILO_TRY/CATCH, MidiReader::ReadNextEvent

* Match Debug::Fail

* DataPoint and DataPointMgr

* Debug::Modal

* Some Timer work

* AutoSlowFrame; almost match Debug

* simplify this float const preservation
  • Loading branch information
@TheNathannator
TheNathannator authored Jun 26, 2024
1 parent fac7fd0 commit 90e9949
Show file tree
Hide file tree
Showing 34 changed files with 1,199 additions and 502 deletions.
2 changes: 0 additions & 2 deletions config/SZBE69_B8/flags.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
"runtime": {
"base": "base",
"flags": [
"-sdata 2",
"-sdata2 2",
"-str reuse,pool,readonly",
"-pragma \"merge_float_consts on\"",

Expand Down
132 changes: 92 additions & 40 deletions config/SZBE69_B8/objects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"network/Services/UserMessage.cpp": "Matching"
}
},
"network/net/json_c": {
"network/json_c": {
"mw_version": "Wii/1.3",
"cflags": "json_c",
"objects": {
Expand Down Expand Up @@ -113,35 +113,6 @@
"network/Platform/WiiNetInit.cpp": "Matching"
}
},
"sdk": {
"mw_version": "Wii/1.3",
"cflags": "base",
"objects": {
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/arith.c": "NonMatching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/buffer_io.c": "NonMatching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/errno.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/rand.c": "NonMatching",
"sdk/RevoEX/src/so/SOCommon.c": "NonMatching",
"sdk/RevoEX/src/so/SOBasic.c": "NonMatching"

}
},
"embedded": {
"mw_version": "Wii/1.3",
"cflags": "runtime",
"objects": {
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/time.dolphin.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/math_ppc.c": "Matching"
}
},
"system": {
"mw_version": "Wii/1.3",
"cflags": "system",
Expand Down Expand Up @@ -519,6 +490,7 @@
"system/utl/ChunkIDs.cpp": "Matching",
"system/utl/ChunkStream.cpp": "NonMatching",
"system/utl/Compress.cpp": "Matching",
"system/utl/DataPointMgr.cpp": "Matching",
"system/utl/EncryptXTEA.cpp": "NonMatching",
"system/utl/FakeSongMgr.cpp": "Matching",
"system/utl/FilePath.cpp": "Matching",
Expand Down Expand Up @@ -586,14 +558,14 @@
"system/world/World.cpp": "NonMatching"
}
},
"flex": {
"system/flex": {
"mw_version": "Wii/1.3",
"cflags": "flex",
"objects": {
"system/obj/DataFlex.c": "NonMatching"
}
},
"speex": {
"system/speex": {
"mw_version": "Wii/1.3",
"cflags": "speex",
"objects": {
Expand Down Expand Up @@ -622,7 +594,7 @@
"system/speex/libspeex/vq.c": "Matching"
}
},
"soundtouch": {
"system/soundtouch": {
"mw_version": "Wii/1.3",
"cflags": "soundtouch",
"objects": {
Expand All @@ -634,7 +606,7 @@
"system/synthwii/soundtouch/source/SoundTouch/TDStretch.cpp": "NonMatching"
}
},
"tomcrypt": {
"system/tomcrypt": {
"mw_version": "Wii/1.3",
"cflags": "libtomcrypt",
"objects": {
Expand All @@ -643,7 +615,7 @@
"system/synth/tomcrypt/ctr.c": "NonMatching"
}
},
"vorbis": {
"system/vorbis": {
"mw_version": "Wii/1.3",
"cflags": "vorbis",
"objects": {
Expand All @@ -669,7 +641,7 @@
"system/oggvorbis/synthesis.c": "NonMatching"
}
},
"zlib": {
"system/zlib": {
"mw_version": "Wii/1.3",
"cflags": "zlib",
"objects": {
Expand All @@ -679,14 +651,94 @@
"system/zlib/trees.c": "Matching",
"system/zlib/inflate.c": "Matching",
"system/zlib/inftrees.c": "Matching",
"system/zlib/inffast.c": "Matching"
"system/zlib/inffast.c": "Matching",
"system/zlib/zutil.c": { "status": "Matching", "cflags": "zlib/zutil" }
}
},
"zlib/zutil": {
"lib/binkwii": {
"mw_version": "Wii/1.3",
"cflags": "zlib/zutil",
"cflags": "base",
"objects": {
"system/zlib/zutil.c": "Matching"

}
},
"sdk/MSL_C": {
"mw_version": "Wii/1.3",
"cflags": "runtime",
"objects": {
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/arith.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/buffer_io.c": "NonMatching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/errno.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/rand.c": "Matching",

"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c": "Matching",

"sdk/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/time.dolphin.c": "Matching",
"sdk/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/math_ppc.c": "Matching"
}
},
"sdk/MSL_C++": {
"mw_version": "Wii/1.3",
"cflags": "runtime",
"objects": {

}
},
"sdk/Runtime": {
"mw_version": "Wii/1.3",
"cflags": "runtime",
"objects": {
"sdk/PowerPC_EABI_Support/Runtime/Gecko_setjmp.cpp": "Matching"
}
},
"sdk/MetroTRK": {
"mw_version": "Wii/1.3",
"cflags": "runtime",
"objects": {

}
},
"sdk/RVL_SDK": {
"mw_version": "Wii/1.3",
"cflags": "rvl_sdk",
"objects": {

}
},
"sdk/RevoEX": {
"mw_version": "Wii/1.3",
"cflags": "base",
"objects": {
"sdk/RevoEX/so/SOCommon.c": "NonMatching",
"sdk/RevoEX/so/SOBasic.c": "NonMatching"
}
},
"sdk/DWC": {
"mw_version": "Wii/1.3",
"cflags": "base",
"objects": {

}
},
"sdk/ec": {
"mw_version": "Wii/1.3",
"cflags": "base",
"objects": {

}
},
"sdk/NdevExi2A": {
"mw_version": "Wii/1.3",
"cflags": "base",
"objects": {

}
}
}
Loading

0 comments on commit 90e9949

Please sign in to comment.