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

[goos] fix pretty printer bugs, update ref after pretty printer changes (#1063)

Browse Source 
* update ref after pretty printer changes

* another try
This commit is contained in:
water111
2022-01-08 15:09:00 -05:00
committed by GitHub
parent 7b1572883c
commit 691c33f8d9
207 changed files with 8537 additions and 8522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/engine/debug/anim-tester_REF.gc
Generated Vendored
+23 -23
View File
@@ -890,22 +890,20 @@
)
(let ((v1-18 (-> (the-as anim-test-sequence s5-0) item-list)))
"is the list empty, #t = empty"
(if (or
(= (-> v1-18 tailpred) v1-18)
(and
(= (glst-num-elements (-> (the-as anim-test-sequence s5-0) item-list)) 1)
(begin
(let ((v1-21 #t)
(a0-13 (-> (the-as anim-test-sequence s5-0) item-list))
)
"return the start of the list"
(let ((a0-16 (the-as int (logand (-> (the-as anim-test-seq-item (-> a0-13 head)) flags) 1))))
(cmove-#f-zero v1-19 a0-16 v1-21)
)
)
v1-19
)
)
(if (or (= (-> v1-18 tailpred) v1-18)
(and (= (glst-num-elements (-> (the-as anim-test-sequence s5-0) item-list)) 1)
(begin
(let ((v1-21 #t)
(a0-13 (-> (the-as anim-test-sequence s5-0) item-list))
)
"return the start of the list"
(let ((a0-16 (the-as int (logand (-> (the-as anim-test-seq-item (-> a0-13 head)) flags) 1))))
(cmove-#f-zero v1-19 a0-16 v1-21)
)
)
v1-19
)
)
)
(glst-remove (-> arg0 seq-list) (the-as anim-test-sequence s5-0))
)
@@ -1740,10 +1738,9 @@
)
(let ((gp-0 (-> arg1 the-node))
(s4-0 (the-as object (-> arg1 list-owner)))
(s2-0 (and
(logtest? (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
(zero? (-> *anim-tester* 0 item-field))
)
(s2-0 (and (logtest? (-> *anim-tester* 0 flags) (anim-tester-flags fanimt3))
(zero? (-> *anim-tester* 0 item-field))
)
)
)
(cond
@@ -2489,7 +2486,10 @@
:event
anim-tester-standard-event-handler
:enter
(behavior () (logior! (-> self flags) (anim-tester-flags fanimt1)) (none))
(behavior ()
(logior! (-> self flags) (anim-tester-flags fanimt1))
(none)
)
:trans
(behavior ()
(if (and (zero? (logand (-> self flags) (anim-tester-flags fanimt1))) (= *master-mode* 'menu))
@@ -2544,8 +2544,8 @@
)
((begin
(if (>= (-> (the-as anim-test-obj s4-0) list-con current-index)
(glst-num-elements (-> (the-as anim-test-obj s4-0) seq-list))
)
(glst-num-elements (-> (the-as anim-test-obj s4-0) seq-list))
)
(set! (-> (the-as anim-test-obj s4-0) list-con current-index)
(+ (glst-num-elements (-> (the-as anim-test-obj s4-0) seq-list)) -1)
)
test/decompiler/reference/engine/debug/debug_REF.gc
Generated Vendored
+14 -19
View File
@@ -192,10 +192,9 @@
)
(set! (-> arg1 w) 1.0)
(set! (-> sv-80 w) 1.0)
(when (and
(transform-point-qword! (the-as vector4w (-> s4-0 quad)) arg1)
(transform-point-qword! (the-as vector4w (&-> s4-0 quad 1)) sv-80)
)
(when (and (transform-point-qword! (the-as vector4w (-> s4-0 quad)) arg1)
(transform-point-qword! (the-as vector4w (&-> s4-0 quad 1)) sv-80)
)
(let* ((v1-28 (-> *display* frames (-> *display* on-screen) frame debug-buf))
(a2-1 (-> v1-28 base))
)
@@ -396,11 +395,10 @@
(set! (-> arg2 w) 1.0)
(set! (-> arg3 w) 1.0)
(set! (-> arg4 w) 1.0)
(when (and
(transform-point-qword! (the-as vector4w (-> s5-0 quad)) arg2)
(transform-point-qword! (the-as vector4w (&-> s5-0 quad 1)) arg3)
(transform-point-qword! (the-as vector4w (&-> s5-0 quad 2)) arg4)
)
(when (and (transform-point-qword! (the-as vector4w (-> s5-0 quad)) arg2)
(transform-point-qword! (the-as vector4w (&-> s5-0 quad 1)) arg3)
(transform-point-qword! (the-as vector4w (&-> s5-0 quad 2)) arg4)
)
(let* ((v1-9 (-> *display* frames (-> *display* on-screen) frame debug-buf))
(a2-1 (-> v1-9 base))
)
@@ -1298,16 +1296,13 @@
(new 'static 'rgba :r #xff :g #xff :b #xff :a #x80)
)
(let ((s2-1 (vector+*! (new-stack-vector0) arg3 (-> arg2 direction) (* 12288.0 (-> arg2 levels x))))
(s1-0 (logior
(logior
(logior
(shr (shl (the int (* 128.0 (-> arg2 color w))) 56) 32)
(shr (shl (the int (* 128.0 (-> arg2 color z))) 56) 40)
)
(shr (shl (the int (* 128.0 (-> arg2 color y))) 56) 48)
)
(shr (shl (the int (* 128.0 (-> arg2 color x))) 56) 56)
)
(s1-0 (logior (logior (logior (shr (shl (the int (* 128.0 (-> arg2 color w))) 56) 32)
(shr (shl (the int (* 128.0 (-> arg2 color z))) 56) 40)
)
(shr (shl (the int (* 128.0 (-> arg2 color y))) 56) 48)
)
(shr (shl (the int (* 128.0 (-> arg2 color x))) 56) 56)
)
)
)
(format (clear *temp-string*) "~S ~,,2f" arg4 (-> arg2 levels x))
test/decompiler/reference/engine/debug/default-menu_REF.gc
Generated Vendored
+6 -7
View File
@@ -533,13 +533,12 @@
;; definition for function dm-shader-pick-func
(defun dm-shader-pick-func ((arg0 texture-id) (arg1 debug-menu-msg))
(if (and
(= arg1 (debug-menu-msg press))
*texture-page-dir*
(-> *texture-page-dir* entries (-> arg0 page) page)
(-> *texture-page-dir* entries (-> arg0 page) link)
(nonzero? (-> *texture-page-dir* entries (-> arg0 page) link next (-> arg0 index)))
)
(if (and (= arg1 (debug-menu-msg press))
*texture-page-dir*
(-> *texture-page-dir* entries (-> arg0 page) page)
(-> *texture-page-dir* entries (-> arg0 page) link)
(nonzero? (-> *texture-page-dir* entries (-> arg0 page) link next (-> arg0 index)))
)
(set! *edit-shader* arg0)
)
(and (nonzero? *edit-shader*) (= arg0 *edit-shader*))
test/decompiler/reference/engine/debug/viewer_REF.gc
Generated Vendored
+10 -12
View File
@@ -125,9 +125,9 @@
(defbehavior init-viewer viewer ((arg0 string))
(let ((s2-0 (load-to-heap-by-name
(-> (if (-> self entity)
(-> self entity extra level)
(-> *level* level-default)
)
(-> self entity extra level)
(-> *level* level-default)
)
art-group
)
arg0
@@ -143,20 +143,18 @@
(when s2-0
(dotimes (s1-0 (-> s2-0 length))
(cond
((and
(not s4-0)
(= (-> s2-0 data s1-0 type) merc-ctrl)
(or (zero? (length viewer-geo-name)) (string= (art-part-name (-> s2-0 data s1-0 name)) viewer-geo-name))
)
((and (not s4-0)
(= (-> s2-0 data s1-0 type) merc-ctrl)
(or (zero? (length viewer-geo-name)) (string= (art-part-name (-> s2-0 data s1-0 name)) viewer-geo-name))
)
(set! s4-0 s1-0)
)
((= (-> s2-0 data s1-0 type) art-joint-geo)
(set! s3-0 s1-0)
)
((and
(= (-> s2-0 data s1-0 type) art-joint-anim)
(or (zero? (length viewer-ja-name)) (string= (art-part-name (-> s2-0 data s1-0 name)) viewer-ja-name))
)
((and (= (-> s2-0 data s1-0 type) art-joint-anim)
(or (zero? (length viewer-ja-name)) (string= (art-part-name (-> s2-0 data s1-0 name)) viewer-ja-name))
)
(set! s5-0 s1-0)
)
)