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] 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_FormExpressionBuildLong.cpp
+43 -43
View File
@@ -538,7 +538,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
std::string expected =
"(begin\n"
" (format (quote #t) \"#(\")\n"
" (format #t \"#(\")\n"
" (cond\n"
" ((type-type? (-> arg0 content-type) integer)\n"
" (set! v1-1 (-> arg0 content-type symbol))\n"
@@ -548,7 +548,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-0 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" (if (zero? s5-0) \"~D\" \" ~D\")\n"
" (-> (the-as (array int32) arg0) s5-0)\n"
" )\n"
@@ -560,7 +560,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-1 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" (if (zero? s5-1) \"~D\" \" ~D\")\n"
" (-> (the-as (array uint32) arg0) s5-1)\n"
" )\n"
@@ -572,7 +572,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-2 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" (if (zero? s5-2) \"~D\" \" ~D\")\n"
" (-> (the-as (array int64) arg0) s5-2)\n"
" )\n"
@@ -584,7 +584,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-3 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" (if (zero? s5-3) \"#x~X\" \" #x~X\")\n"
" (-> (the-as (array uint64) arg0) s5-3)\n"
" )\n"
@@ -596,7 +596,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-4 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" (if (zero? s5-4) \"~D\" \" ~D\")\n"
" (-> (the-as (array int8) arg0) s5-4)\n"
" )\n"
@@ -608,7 +608,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-5 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" (if (zero? s5-5) \"~D\" \" ~D\")\n"
" (-> (the-as (array uint8) arg0) s5-5)\n"
" )\n"
@@ -620,7 +620,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-6 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" (if (zero? s5-6) \"~D\" \" ~D\")\n"
" (-> (the-as (array int16) arg0) s5-6)\n"
" )\n"
@@ -632,7 +632,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-7 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" (if (zero? s5-7) \"~D\" \" ~D\")\n"
" (-> (the-as (array uint16) arg0) s5-7)\n"
" )\n"
@@ -646,7 +646,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-8 (-> arg0 length))\n"
" (set! t9-10 format)\n"
" (set! a0-21 (quote #t))\n"
" (set! a0-21 #t)\n"
" (set! a1-11 (if (zero? s5-8) \"#x~X\" \" #x~X\"))\n"
" (set!\n"
" v1-42\n"
@@ -662,7 +662,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (while\n"
" (< s5-9 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" (if (zero? s5-9) \"~D\" \" ~D\")\n"
" (-> (the-as (array int32) arg0) s5-9)\n"
" )\n"
@@ -681,8 +681,8 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (< s5-10 (-> arg0 length))\n"
" (if\n"
" (zero? s5-10)\n"
" (format (quote #t) \"~f\" (-> (the-as (array float) arg0) s5-10))\n"
" (format (quote #t) \" ~f\" (-> (the-as (array float) arg0) s5-10))\n"
" (format #t \"~f\" (-> (the-as (array float) arg0) s5-10))\n"
" (format #t \" ~f\" (-> (the-as (array float) arg0) s5-10))\n"
" )\n"
" (+! s5-10 1)\n"
" )\n"
@@ -693,8 +693,8 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (< s5-11 (-> arg0 length))\n"
" (if\n"
" (zero? s5-11)\n"
" (format (quote #t) \"~A\" (-> (the-as (array basic) arg0) s5-11))\n"
" (format (quote #t) \" ~A\" (-> (the-as (array basic) arg0) s5-11))\n"
" (format #t \"~A\" (-> (the-as (array basic) arg0) s5-11))\n"
" (format #t \" ~A\" (-> (the-as (array basic) arg0) s5-11))\n"
" )\n"
" (+! s5-11 1)\n"
" )\n"
@@ -702,7 +702,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" )\n"
" )\n"
" )\n"
" (format (quote #t) \")\")\n"
" (format #t \")\")\n"
" arg0\n"
" )";
test_with_expr(func, type, expected, true, "array",
@@ -1188,12 +1188,12 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
std::string expected =
"(begin\n"
" (format (quote #t) \"[~8x] ~A~%\" arg0 (-> arg0 type))\n"
" (format (quote #t) \"~Tallocated-length: ~D~%\" (-> arg0 allocated-length))\n"
" (format (quote #t) \"~Tlength: ~D~%\" (-> arg0 length))\n"
" (format (quote #t) \" ~Tcontent-type: ~A~%\" (-> arg0 content-type))\n"
" (format #t \"[~8x] ~A~%\" arg0 (-> arg0 type))\n"
" (format #t \"~Tallocated-length: ~D~%\" (-> arg0 allocated-length))\n"
" (format #t \"~Tlength: ~D~%\" (-> arg0 length))\n"
" (format #t \" ~Tcontent-type: ~A~%\" (-> arg0 content-type))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~Tdata[~D]: @ #x~X~%\"\n"
" (-> arg0 allocated-length)\n"
" (-> arg0 data)\n"
@@ -1207,7 +1207,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-0 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] ~D~%\"\n"
" s5-0\n"
" (-> (the-as (array int32) arg0) s5-0)\n"
@@ -1220,7 +1220,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-1 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] ~D~%\"\n"
" s5-1\n"
" (-> (the-as (array uint32) arg0) s5-1)\n"
@@ -1233,7 +1233,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-2 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] ~D~%\"\n"
" s5-2\n"
" (-> (the-as (array int64) arg0) s5-2)\n"
@@ -1246,7 +1246,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-3 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] #x~X~%\"\n"
" s5-3\n"
" (-> (the-as (array uint64) arg0) s5-3)\n"
@@ -1259,7 +1259,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-4 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] ~D~%\"\n"
" s5-4\n"
" (-> (the-as (array int8) arg0) s5-4)\n"
@@ -1272,7 +1272,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-5 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] ~D~%\"\n"
" s5-5\n"
" (-> (the-as (array int8) arg0) s5-5)\n"
@@ -1285,7 +1285,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-6 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] ~D~%\"\n"
" s5-6\n"
" (-> (the-as (array int16) arg0) s5-6)\n"
@@ -1298,7 +1298,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-7 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] ~D~%\"\n"
" s5-7\n"
" (-> (the-as (array uint16) arg0) s5-7)\n"
@@ -1313,7 +1313,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-8 (-> arg0 length))\n"
" (set! t9-14 format)\n"
" (set! a0-25 (quote #t))\n"
" (set! a0-25 #t)\n"
" (set! a1-15 \"~T [~D] #x~X~%\")\n"
" (set! a2-13 s5-8)\n"
" (set!\n"
@@ -1329,7 +1329,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (set! s5-9 0)\n"
" (while\n"
" (< s5-9 (-> arg0 length))\n"
" (format (quote #t) \"~T [~D] ~D~%\" s5-9 (-> arg0 s5-9))\n"
" (format #t \"~T [~D] ~D~%\" s5-9 (-> arg0 s5-9))\n"
" (+! s5-9 1)\n"
" )\n"
" )\n"
@@ -1344,7 +1344,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-10 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] ~f~%\"\n"
" s5-10\n"
" (-> (the-as (array float) arg0) s5-10)\n"
@@ -1357,7 +1357,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-11 (-> arg0 length))\n"
" (format\n"
" (quote #t)\n"
" #t\n"
" \"~T [~D] ~A~%\"\n"
" s5-11\n"
" (-> (the-as (array basic) arg0) s5-11)\n"
@@ -1954,10 +1954,10 @@ TEST_F(FormRegressionTest, ExprValid) {
" )\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" (else #t)\n"
" )\n"
" )\n"
" ((and arg3 (not arg0)) (quote #t))\n"
" ((and arg3 (not arg0)) #t)\n"
" (else\n"
" (cond\n"
" ((= arg1 structure)\n"
@@ -1995,7 +1995,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" )\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" (else #t)\n"
" )\n"
" )\n"
" ((= arg1 pair)\n"
@@ -2026,12 +2026,12 @@ TEST_F(FormRegressionTest, ExprValid) {
" )\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" (else #t)\n"
" )\n"
" )\n"
" ((= arg1 binteger)\n"
" (cond\n"
" ((zero? (logand (the-as int arg0) 7)) (quote #t))\n"
" ((zero? (logand (the-as int arg0) 7)) #t)\n"
" (else\n"
" (if\n"
" arg2\n"
@@ -2092,7 +2092,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" (cond\n"
" ((and\t\n"
" (!= arg1 type)\t\n"
" (not (valid? (rtype-of arg0) type #f (quote #t) 0))\t\n"
" (not (valid? (rtype-of arg0) type #f #t 0))\t\n"
" )\n"
" (if\n"
" arg2\n"
@@ -2141,7 +2141,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" )\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" (else #t)\n"
" )\n"
" )\n"
" ((begin\n"
@@ -2162,7 +2162,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" )\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" (else #t)\n"
" )\n"
" )\n"
" )\n"
@@ -2489,7 +2489,7 @@ TEST_F(FormRegressionTest, ExprStringToInt) {
" (set! a0-3 (&-> a0-2 1))\n"
" (when\n"
" (= (-> a0-3 1) 45)\n"
" (set! v1-0 (quote #t))\n"
" (set! v1-0 #t)\n"
" (set! a0-3 (&-> a0-3 1))\n"
" (set! a1-8 a0-3)\n"
" )\n"
@@ -2548,7 +2548,7 @@ TEST_F(FormRegressionTest, ExprStringToInt) {
" (else\n"
" (when\n"
" (= (-> a0-1 1) 45)\n"
" (set! v1-0 (quote #t))\n"
" (set! v1-0 #t)\n"
" (set! a0-1 (&-> a0-1 1))\n"
" (set! a1-47 a0-1)\n"
" )\n"