mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-07 22:22:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

[decompiler] bitfield support for sound-name (#582)

Browse Source 
* fix 64-bit fields in 128-bit bitfields

* support sound-name

* fix merge

* support some more sound stuff in overlord
This commit is contained in:
water111
2021-06-12 12:55:38 -04:00
committed by GitHub
parent 877e3d161c
commit 8faded6400
35 changed files with 718 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/test_FormExpressionBuild2.cpp
+98
View File
@@ -1174,6 +1174,83 @@ TEST_F(FormRegressionTest, Method4ResTag) {
test_with_expr(func, type, expected);
}
TEST_F(FormRegressionTest, MakeSqrtTable) {
std::string func =
"sll r0, r0, 0\n"
"L149:\n"
" daddiu sp, sp, -32\n"
" sd ra, 0(sp)\n"
" sd fp, 8(sp)\n"
" or fp, t9, r0\n"
" sq gp, 16(sp)\n"
" lw t9, format(s7)\n"
" daddiu a0, s7, #t\n"
" daddiu a1, fp, L190\n"
" jalr ra, t9\n"
" sll v0, ra, 0\n"
" addiu gp, r0, 0\n"
" beq r0, r0, L151\n"
" sll r0, r0, 0\n"
"L150:\n"
//" lwc1 f0, L232(fp)\n"
" mtc1 f0, r0\n"
" mtc1 f1, gp\n"
" cvt.s.w f1, f1\n"
" mul.s f0, f0, f1\n"
" sqrt.s f0, f0\n"
//" lwc1 f1, L233(fp)\n"
" mtc1 f1, r0\n"
" add.s f0, f1, f0\n"
" cvt.w.s f0, f0\n"
" mfc1 a2, f0\n"
" lw t9, format(s7)\n"
" daddiu a0, s7, #t\n"
" daddiu a1, fp, L189\n"
" jalr ra, t9\n"
" sll v0, ra, 0\n"
" or v1, v0, r0\n"
" daddiu gp, gp, 1\n"
"L151:\n"
" slti v1, gp, 256\n"
" bne v1, r0, L150\n"
" sll r0, r0, 0\n"
" or v1, s7, r0\n"
" or v1, s7, r0\n"
" lw t9, format(s7)\n"
" daddiu a0, s7, #t\n"
" daddiu a1, fp, L188\n"
" jalr ra, t9\n"
" sll v0, ra, 0\n"
" or v0, r0, r0\n"
" ld ra, 0(sp)\n"
" ld fp, 8(sp)\n"
" lq gp, 16(sp)\n"
" jr ra\n"
" daddiu sp, sp, 32\n"
" sll r0, r0, 0\n"
" sll r0, r0, 0";
std::string type = "(function none)";
std::string expected =
"(begin\n"
" (format #t \"static int sqrt_table[256] =~%{~%\")\n"
" (dotimes (gp-0 256)\n"
" (let* ((f0-2 (sqrtf (* 0.0 (the float gp-0))))\n"
" (a2-0 (the int (+ 0.0 f0-2)))\n"
" )\n"
" (format #t \"~D,~%\" a2-0)\n"
" )\n"
" )\n"
" (format #t \"};~%\")\n"
" (let ((v0-3 0))\n"
" )\n"
" (none)\n"
" )";
test_with_expr(
func, type, expected, false, "",
{{"L190", "static int sqrt_table[256] =~%{~%"}, {"L189", "~D,~%"}, {"L188", "};~%"}});
}
TEST_F(FormRegressionTest, Method2Vec4s) {
std::string func =
"sll r0, r0, 0\n"
@@ -1218,4 +1295,25 @@ TEST_F(FormRegressionTest, Method2Vec4s) {
" arg0\n"
" )";
test_with_expr(func, type, expected, false, "", {{"L344", "#<vector ~F ~F ~F ~F @ #x~X>"}});
}
TEST_F(FormRegressionTest, SoundNameEqual) {
std::string func =
"sll r0, r0, 0\n"
" dsubu v1, a0, a1\n"
" daddiu a2, s7, 8\n"
" movn a2, s7, v1\n"
" beql s7, a2, L125\n"
" or v0, a2, r0\n"
" pcpyud v1, a0, r0\n"
" pcpyud a0, a1, r0\n"
" dsubu v1, v1, a0\n"
" daddiu v0, s7, 8\n"
" movn v0, s7, v1\n"
"L125:\n"
" jr ra\n"
" daddu sp, sp, r0";
std::string type = "(function sound-name sound-name symbol)";
std::string expected = "(and (= arg0 arg1) (= (-> arg0 hi) (-> arg1 hi)))";
test_with_expr(func, type, expected);
}