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

[Decompiler] Fix issues in gcommon (#305)

Browse Source 
* fix several issues

* small fixes
This commit is contained in:
water111
2021-03-03 20:52:25 -05:00
committed by GitHub
parent 413c1f5c74
commit d9aa535dd0
41 changed files with 638 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/test_gkernel_decomp.cpp
+12 -12
View File
@@ -167,7 +167,7 @@ TEST_F(FormRegressionTest, ExprMethod2Thread) {
std::string expected =
"(begin\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"#<~A ~S of ~S pc: #x~X @ #x~X>\"\n"
" (-> arg0 type)\n"
" (-> arg0 name)\n"
@@ -522,21 +522,21 @@ TEST_F(FormRegressionTest, RemoveMethod3ProcessTree) {
// gross, but expected. see https://github.com/water111/jak-project/issues/254
std::string expected =
"(begin\n"
" (format (quote #t) \"[~8x] ~A~%\" arg0 (-> arg0 type))\n"
" (format (quote #t) \"~Tname: ~S~%\" (-> arg0 name))\n"
" (format (quote #t) \"~Tmask: #x~X~%\" (-> arg0 mask))\n"
" (format #t \"[~8x] ~A~%\" arg0 (-> arg0 type))\n"
" (format #t \"~Tname: ~S~%\" (-> arg0 name))\n"
" (format #t \"~Tmask: #x~X~%\" (-> arg0 mask))\n"
" (set! t9-3 format)\n"
" (set! a0-4 (quote #t))\n"
" (set! a0-4 #t)\n"
" (set! a1-3 \"~Tparent: ~A~%\")\n"
" (set! v1-0 (-> arg0 parent))\n"
" (t9-3 a0-4 a1-3 (if v1-0 (-> v1-0 0 self)))\n"
" (set! t9-4 format)\n"
" (set! a0-5 (quote #t))\n"
" (set! a0-5 #t)\n"
" (set! a1-4 \"~Tbrother: ~A~%\")\n"
" (set! v1-2 (-> arg0 brother))\n"
" (t9-4 a0-5 a1-4 (if v1-2 (-> v1-2 0 self)))\n"
" (set! t9-5 format)\n"
" (set! a0-6 (quote #t))\n"
" (set! a0-6 #t)\n"
" (set! a1-5 \"~Tchild: ~A~%\")\n"
" (set! v1-4 (-> arg0 child))\n"
" (t9-5 a0-6 a1-5 (if v1-4 (-> v1-4 0 self)))\n"
@@ -799,7 +799,7 @@ TEST_F(FormRegressionTest, ExprMethod2Process) {
std::string expected =
"(begin\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"#<~A ~S ~A :state ~S \"\n"
" (-> arg0 type)\n"
" (-> arg0 name)\n"
@@ -807,7 +807,7 @@ TEST_F(FormRegressionTest, ExprMethod2Process) {
" (if (-> arg0 state) (-> arg0 state name))\n"
" )\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \":stack ~D/~D :heap ~D/~D @ #x~X>\"\n"
" (- (-> arg0 top-thread stack-top) (the-as uint (-> arg0 top-thread sp)))\n"
" (-> arg0 main-thread stack-size)\n"
@@ -1530,7 +1530,7 @@ TEST_F(FormRegressionTest, ExprMethod3DeadPoolHeap) {
" (if (-> arg0 alive-list prev) (gap-size arg0 (-> arg0 alive-list prev)) s5-0)\n"
" )\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~Tprocess-list[0] @ #x~X ~D/~D bytes used~%\"\n"
" (-> arg0 process-list)\n"
" (- s5-0 v1-3)\n"
@@ -1543,7 +1543,7 @@ TEST_F(FormRegressionTest, ExprMethod3DeadPoolHeap) {
" (if\n"
" (-> s5-1 process)\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~3D] #<dead-pool-heap-rec @ #x~X> ~A~%\"\n"
" s4-0\n"
" s5-1\n"
@@ -1554,7 +1554,7 @@ TEST_F(FormRegressionTest, ExprMethod3DeadPoolHeap) {
" (if\n"
" (nonzero? s3-0)\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T gap: ~D bytes @ #x~X~%\"\n"
" s3-0\n"
" (gap-location arg0 s5-1)\n"