mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-06-01 17:58:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get started on collide-func and clean up log forms in decompiler (#713)

Browse Source 
* wip

* temp

* temp2

* first part of log macros

* more log macros

* logtest

* clean up

* dont initialize game info because we are missing stuff
This commit is contained in:
water111
2021-07-23 20:51:26 -04:00
committed by GitHub
parent 65b61d05e6
commit 95366d21df
73 changed files with 1900 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/test_FormExpressionBuild.cpp
+6 -14
View File
@@ -1935,16 +1935,11 @@ TEST_F(FormRegressionTest, ExprMemOr) {
std::string type = "(function pointer pointer int pointer)";
std::string expected =
"(let\n"
" ((v0-0 arg0))\n"
" (dotimes\n"
" (v1-0 arg2)\n"
" (set!\n"
"(let ((v0-0 arg0))\n"
" (dotimes (v1-0 arg2)\n"
" (logior!\n"
" (-> (the-as (pointer uint8) arg0))\n"
" (logior\n"
" (-> (the-as (pointer uint8) arg0))\n"
" (-> (the-as (pointer uint8) arg1))\n"
" )\n"
" (-> (the-as (pointer uint8) arg1))\n"
" )\n"
" (&+! arg0 1)\n"
" (&+! arg1 1)\n"
@@ -2904,10 +2899,7 @@ TEST_F(FormRegressionTest, AshPropagation) {
std::string type = "(function bit-array int int)";
std::string expected =
"(begin\n"
" (set!\n"
" (-> arg0 bytes (/ arg1 8))\n"
" (logior (-> arg0 bytes (/ arg1 8)) (the-as uint (ash 1 (logand arg1 7))))\n"
" )\n"
" (logior! (-> arg0 bytes (/ arg1 8)) (ash 1 (logand arg1 7)))\n"
" 0\n"
" )";
test_with_expr(func, type, expected);
@@ -2942,7 +2934,7 @@ TEST_F(FormRegressionTest, AshPropagation2) {
std::string type = "(function bit-array int symbol)";
std::string expected =
"(let ((v1-2 (-> arg0 bytes (/ arg1 8))))\n"
" (nonzero? (logand v1-2 (the-as uint (ash 1 (logand arg1 7)))))\n"
" (nonzero? (logand v1-2 (ash 1 (logand arg1 7))))\n"
" )";
test_with_expr(func, type, expected);
}