mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-05-25 23:35:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompiler fixes + decompiling (#276)

Browse Source 
* decomp pad

* more decompilation

* update

* fix test name
This commit is contained in:
water111
2021-02-22 09:36:30 -05:00
committed by GitHub
parent ac24b2ab15
commit 5ec9a91eb9
48 changed files with 2567 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/test_FormExpressionBuildLong.cpp
+42 -45
View File
@@ -552,7 +552,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (if (zero? s5-0) \"~D\" \" ~D\")\n"
" (-> (the-as (array int32) arg0) s5-0)\n"
" )\n"
" (set! s5-0 (+ s5-0 1))\n"
" (+! s5-0 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote uint32))\n"
@@ -564,7 +564,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (if (zero? s5-1) \"~D\" \" ~D\")\n"
" (-> (the-as (array uint32) arg0) s5-1)\n"
" )\n"
" (set! s5-1 (+ s5-1 1))\n"
" (+! s5-1 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote int64))\n"
@@ -576,7 +576,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (if (zero? s5-2) \"~D\" \" ~D\")\n"
" (-> (the-as (array int64) arg0) s5-2)\n"
" )\n"
" (set! s5-2 (+ s5-2 1))\n"
" (+! s5-2 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote uint64))\n"
@@ -588,7 +588,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (if (zero? s5-3) \"#x~X\" \" #x~X\")\n"
" (-> (the-as (array uint64) arg0) s5-3)\n"
" )\n"
" (set! s5-3 (+ s5-3 1))\n"
" (+! s5-3 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote int8))\n"
@@ -600,7 +600,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (if (zero? s5-4) \"~D\" \" ~D\")\n"
" (-> (the-as (array int8) arg0) s5-4)\n"
" )\n"
" (set! s5-4 (+ s5-4 1))\n"
" (+! s5-4 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote uint8))\n"
@@ -612,7 +612,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (if (zero? s5-5) \"~D\" \" ~D\")\n"
" (-> (the-as (array uint8) arg0) s5-5)\n"
" )\n"
" (set! s5-5 (+ s5-5 1))\n"
" (+! s5-5 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote int16))\n"
@@ -624,7 +624,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (if (zero? s5-6) \"~D\" \" ~D\")\n"
" (-> (the-as (array int16) arg0) s5-6)\n"
" )\n"
" (set! s5-6 (+ s5-6 1))\n"
" (+! s5-6 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote uint16))\n"
@@ -636,7 +636,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (if (zero? s5-7) \"~D\" \" ~D\")\n"
" (-> (the-as (array uint16) arg0) s5-7)\n"
" )\n"
" (set! s5-7 (+ s5-7 1))\n"
" (+! s5-7 1)\n"
" )\n"
" )\n"
" (else\n"
@@ -654,7 +654,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" )\n"
" (.lq a2-8 12 v1-42)\n"
" (t9-10 a0-21 a1-11 a2-8)\n"
" (set! s5-8 (+ s5-8 1))\n"
" (+! s5-8 1)\n"
" )\n"
" )\n"
" (else\n"
@@ -666,7 +666,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (if (zero? s5-9) \"~D\" \" ~D\")\n"
" (-> (the-as (array int32) arg0) s5-9)\n"
" )\n"
" (set! s5-9 (+ s5-9 1))\n"
" (+! s5-9 1)\n"
" )\n"
" )\n"
" )\n"
@@ -684,7 +684,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (format (quote #t) \"~f\" (-> (the-as (array float) arg0) s5-10))\n"
" (format (quote #t) \" ~f\" (-> (the-as (array float) arg0) s5-10))\n"
" )\n"
" (set! s5-10 (+ s5-10 1))\n"
" (+! s5-10 1)\n"
" )\n"
" )\n"
" (else\n"
@@ -696,7 +696,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod2) {
" (format (quote #t) \"~A\" (-> (the-as (array basic) arg0) s5-11))\n"
" (format (quote #t) \" ~A\" (-> (the-as (array basic) arg0) s5-11))\n"
" )\n"
" (set! s5-11 (+ s5-11 1))\n"
" (+! s5-11 1)\n"
" )\n"
" )\n"
" )\n"
@@ -1212,7 +1212,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-0\n"
" (-> (the-as (array int32) arg0) s5-0)\n"
" )\n"
" (set! s5-0 (+ s5-0 1))\n"
" (+! s5-0 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote uint32))\n"
@@ -1225,7 +1225,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-1\n"
" (-> (the-as (array uint32) arg0) s5-1)\n"
" )\n"
" (set! s5-1 (+ s5-1 1))\n"
" (+! s5-1 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote int64))\n"
@@ -1238,7 +1238,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-2\n"
" (-> (the-as (array int64) arg0) s5-2)\n"
" )\n"
" (set! s5-2 (+ s5-2 1))\n"
" (+! s5-2 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote uint64))\n"
@@ -1251,7 +1251,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-3\n"
" (-> (the-as (array uint64) arg0) s5-3)\n"
" )\n"
" (set! s5-3 (+ s5-3 1))\n"
" (+! s5-3 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote int8))\n"
@@ -1264,7 +1264,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-4\n"
" (-> (the-as (array int8) arg0) s5-4)\n"
" )\n"
" (set! s5-4 (+ s5-4 1))\n"
" (+! s5-4 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote uint8))\n"
@@ -1277,7 +1277,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-5\n"
" (-> (the-as (array int8) arg0) s5-5)\n"
" )\n"
" (set! s5-5 (+ s5-5 1))\n"
" (+! s5-5 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote int16))\n"
@@ -1290,7 +1290,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-6\n"
" (-> (the-as (array int16) arg0) s5-6)\n"
" )\n"
" (set! s5-6 (+ s5-6 1))\n"
" (+! s5-6 1)\n"
" )\n"
" )\n"
" ((= v1-1 (quote uint16))\n"
@@ -1303,7 +1303,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-7\n"
" (-> (the-as (array uint16) arg0) s5-7)\n"
" )\n"
" (set! s5-7 (+ s5-7 1))\n"
" (+! s5-7 1)\n"
" )\n"
" )\n"
" (else\n"
@@ -1322,7 +1322,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" )\n"
" (.lq a3-10 12 v1-42)\n"
" (t9-14 a0-25 a1-15 a2-13 a3-10)\n"
" (set! s5-8 (+ s5-8 1))\n"
" (+! s5-8 1)\n"
" )\n"
" )\n"
" (else\n"
@@ -1330,7 +1330,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" (while\n"
" (< s5-9 (-> arg0 length))\n"
" (format (quote #t) \"~T [~D] ~D~%\" s5-9 (-> arg0 s5-9))\n"
" (set! s5-9 (+ s5-9 1))\n"
" (+! s5-9 1)\n"
" )\n"
" )\n"
" )\n"
@@ -1349,7 +1349,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-10\n"
" (-> (the-as (array float) arg0) s5-10)\n"
" )\n"
" (set! s5-10 (+ s5-10 1))\n"
" (+! s5-10 1)\n"
" )\n"
" )\n"
" (else\n"
@@ -1362,7 +1362,7 @@ TEST_F(FormRegressionTest, ExprArrayMethod3) {
" s5-11\n"
" (-> (the-as (array basic) arg0) s5-11)\n"
" )\n"
" (set! s5-11 (+ s5-11 1))\n"
" (+! s5-11 1)\n"
" )\n"
" )\n"
" )\n"
@@ -1940,7 +1940,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg2\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" ((not v1-1)\n"
" (if\n"
@@ -1952,7 +1952,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg2\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" )\n"
@@ -1973,7 +1973,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg1\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" ((or\n"
" (not v1-1)\n"
@@ -1993,7 +1993,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg1\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" )\n"
@@ -2011,7 +2011,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg1\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" ((not v1-1)\n"
" (if\n"
@@ -2024,7 +2024,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg1\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" )\n"
@@ -2043,7 +2043,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg1\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" )\n"
" )\n"
@@ -2058,7 +2058,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg1\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" ((not v1-1)\n"
" (if\n"
@@ -2071,7 +2071,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg1\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" ((and (= arg1 type) (!= (rtype-of arg0) type))\n"
" (if\n"
@@ -2086,13 +2086,13 @@ TEST_F(FormRegressionTest, ExprValid) {
" (rtype-of arg0)\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" (else\n"
" (cond\n"
" ((and\t\n"
" (!= arg1 type)\t\n"
" (not (valid? (rtype-of arg0) type (quote #f) (quote #t) 0))\t\n"
" (not (valid? (rtype-of arg0) type #f (quote #t) 0))\t\n"
" )\n"
" (if\n"
" arg2\n"
@@ -2106,7 +2106,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" (rtype-of arg0)\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" ((not (type-type? (rtype-of arg0) arg1))\n"
" (if\n"
@@ -2121,7 +2121,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" (rtype-of arg0)\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" ((= arg1 symbol)\n"
" (set! v1-43 32768)\n"
@@ -2139,7 +2139,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg1\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" )\n"
@@ -2160,7 +2160,7 @@ TEST_F(FormRegressionTest, ExprValid) {
" arg1\n"
" )\n"
" )\n"
" (quote #f)\n"
" #f\n"
" )\n"
" (else (quote #t))\n"
" )\n"
@@ -2472,23 +2472,20 @@ TEST_F(FormRegressionTest, ExprStringToInt) {
" (a0-2 (pointer uint8))\n"
" (a0-3 (pointer uint8))\n"
" (a0-4 (pointer uint8))\n"
" (a0-5 symbol)\n"
" (a1-8 (pointer uint8))\n"
" (a1-14 uint)\n"
" (a1-20 uint)\n"
" (a1-23 uint)\n"
" (a1-33 symbol)\n"
" (a1-44 symbol)\n"
" (a1-47 (pointer uint8))\n"
" )\n"
" (set! a0-1 (-> arg0 data))\n"
" (set! v0-0 0)\n"
" (set! v1-0 (quote #f))\n"
" (set! v1-0 #f)\n"
" (cond\n"
" ((= (-> a0-1 0) 35)\n"
" (set! a0-2 (&-> a0-1 1))\n"
" (cond\n"
" ((or (zero? (+ (-> a0-2 0) -120)) (zero? (+ (-> a0-2 0) -88)))\n"
" ((or (= (-> a0-2 0) 120) (= (-> a0-2 0) 88))\n"
" (set! a0-3 (&-> a0-2 1))\n"
" (when\n"
" (= (-> a0-3 1) 45)\n"
@@ -2538,7 +2535,7 @@ TEST_F(FormRegressionTest, ExprStringToInt) {
" (set! a0-3 (&-> a0-3 1))\n"
" )\n"
" )\n"
" ((or (zero? (+ (-> a0-2 0) -98)) (zero? (+ (-> a0-2 0) -66)))\n"
" ((or (= (-> a0-2 0) 98) (= (-> a0-2 0) 66))\n"
" (set! a0-4 (&-> a0-2 1))\n"
" (while\n"
" (and (>= (-> a0-4 0) (the-as uint 48)) (>= (the-as uint 49) (-> a0-4 0)))\n"