Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 11:26:18 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Make buttons a bitfield and fix let bug (#399)

Browse source 
* make pad buttons bitfields

* fix stupid let bug

* update tests
This commit is contained in:
water111 2021-04-29 20:25:45 -04:00 committed by GitHub
parent 70d93354eb
commit 56625bb0ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 336 additions and 220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
decompiler/analysis/variable_naming.cpp
View file

@ -359,7 +359,8 @@ SSA make_rc_ssa(const Function& function, const RegUsageInfo& rui, const Functio
auto as_set = dynamic_cast<const SetVarOp*>(op.get()); auto as_set = dynamic_cast<const SetVarOp*>(op.get());
if (as_set) { if (as_set) {
auto dst = as_set->dst().reg(); auto dst = as_set->dst().reg();
if (as_set->src().is_var()) { if (as_set->src().is_var() ||
(as_set->src().kind() == SimpleExpression::Kind::FPR_TO_GPR)) {
auto src = as_set->src().get_arg(0).var().reg(); auto src = as_set->src().get_arg(0).var().reg();
auto& ri = rui.op.at(op_id); auto& ri = rui.op.at(op_id);
if (ri.consumes.find(src) != ri.consumes.end() && if (ri.consumes.find(src) != ri.consumes.end() &&

56
decompiler/config/all-types.gc
View file

@ -991,7 +991,7 @@
) )
(deftype vector16b (structure) (deftype vector16b (structure)
((data int8 8 :offset-assert 0) ((data int8 16 :offset-assert 0)
(quad uint128 :offset 0) (quad uint128 :offset 0)
) )
:method-count-assert 9 :method-count-assert 9
@ -2786,16 +2786,38 @@
;;;; PAD ;;;;;;;;;;;;;;;;;;; ;;;; PAD ;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~; ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~;
(defenum pad-buttons
:bitfield #t
:type uint32
(select 0)
(l3 1)
(r3 2)
(start 3)
(up 4)
(right 5)
(down 6)
(left 7)
(l2 8)
(r2 9)
(l1 10)
(r1 11)
(triangle 12)
(circle 13)
(x 14)
(square 15)
)
(deftype hw-cpad (basic) (deftype hw-cpad (basic)
((valid uint8 :offset-assert 4) ((valid uint8 :offset-assert 4)
(status uint8 :offset-assert 5) (status uint8 :offset-assert 5)
(button0 uint16 :offset-assert 6) (button0 uint16 :offset-assert 6)
(rightx uint8 :offset-assert 8) (rightx uint8 :offset-assert 8)
(righty uint8 :offset-assert 9) (righty uint8 :offset-assert 9)
(leftx uint8 :offset-assert 10) (leftx uint8 :offset-assert 10)
(lefty uint8 :offset-assert 11) (lefty uint8 :offset-assert 11)
(abutton uint8 12 :offset-assert 12) (abutton uint8 12 :offset-assert 12)
(dummy uint8 12 :offset-assert 24) (dummy uint8 12 :offset-assert 24)
) )
:method-count-assert 9 :method-count-assert 9
:size-assert #x24 :size-assert #x24
@ -2805,9 +2827,9 @@
(deftype cpad-info (hw-cpad) (deftype cpad-info (hw-cpad)
((number int32 :offset-assert 36) ((number int32 :offset-assert 36)
(cpad-file int32 :offset-assert 40) (cpad-file int32 :offset-assert 40)
(button0-abs uint32 3 :offset-assert 44) ;; guess (button0-abs pad-buttons 3 :offset-assert 44) ;; guess
(button0-shadow-abs uint32 1 :offset-assert 56) ;; guess (button0-shadow-abs pad-buttons 1 :offset-assert 56) ;; guess
(button0-rel uint32 3 :offset-assert 60) ;; guess (button0-rel pad-buttons 3 :offset-assert 60) ;; guess
(stick0-dir float :offset-assert 72) (stick0-dir float :offset-assert 72)
(stick0-speed float :offset-assert 76) (stick0-speed float :offset-assert 76)
(new-pad int32 :offset-assert 80) (new-pad int32 :offset-assert 80)
@ -4399,7 +4421,7 @@
(define-extern *math-camera* math-camera) ;; unknown type (define-extern *math-camera* math-camera) ;; unknown type
(define-extern *math-camera-fog-correction* fog-corrector) ;; unknown type (define-extern *math-camera-fog-correction* fog-corrector) ;; unknown type
(define-extern init-for-transform function) (define-extern init-for-transform function)
(define-extern move-target-from-pad (function (pointer float) int none)) (define-extern move-target-from-pad (function transform int none))
(define-extern transform-point-vector! function) (define-extern transform-point-vector! function)
(define-extern fog-corrector-setup (function fog-corrector math-camera float)) (define-extern fog-corrector-setup (function fog-corrector math-camera float))
;;(define-extern fog-corrector object) ;; unknown type ;;(define-extern fog-corrector object) ;; unknown type
@ -4487,7 +4509,7 @@
(dest-verts char-verts :inline :offset-assert 752) (dest-verts char-verts :inline :offset-assert 752)
(justify vector 64 :inline :offset-assert 944) (justify vector 64 :inline :offset-assert 944)
(color-shadow vector4w :inline :offset-assert 1968) (color-shadow vector4w :inline :offset-assert 1968)
(color-table vector 64 :inline :offset-assert 1984) (color-table vector16b 64 :inline :offset-assert 1984)
(last-color uint64 :offset-assert 3008) (last-color uint64 :offset-assert 3008)
(save-last-color uint64 :offset-assert 3016) (save-last-color uint64 :offset-assert 3016)
(buf basic :offset-assert 3024) (buf basic :offset-assert 3024)
@ -33289,12 +33311,12 @@
;;(define-extern aspect4x3 object) ;; unknown type ;;(define-extern aspect4x3 object) ;; unknown type
;;(define-extern font-work object) ;; unknown type ;;(define-extern font-work object) ;; unknown type
(define-extern font-set-tex0 (function font-work texture uint uint uint none)) (define-extern font-set-tex0 (function (pointer gs-tex0) texture uint uint uint none))
(define-extern *font-default-matrix* matrix) ;; unknown type (define-extern *font-default-matrix* matrix) ;; unknown type
;;(define-extern char-verts object) ;; unknown type ;;(define-extern char-verts object) ;; unknown type
;;(define-extern char-color object) ;; unknown type ;;(define-extern char-color object) ;; unknown type
;;(define-extern font-context object) ;; unknown type ;;(define-extern font-context object) ;; unknown type
;;(define-extern *font-work* object) ;; unknown type (define-extern *font-work* font-work) ;; unknown type
;;(define-extern decomp-work object) ;; unknown type ;;(define-extern decomp-work object) ;; unknown type
(define-extern draw-string-xy (function string dma-buffer int int int none)) (define-extern draw-string-xy (function string dma-buffer int int int none))
;;(define-extern end-draw object) ;; unknown type ;;(define-extern end-draw object) ;; unknown type

2
decompiler/config/jak1_ntsc_black_label/stack_vars.jsonc
View file

@ -134,6 +134,8 @@
"circle-test": [[16, "sphere"], [32, "sphere"], [48, "vector"], [64, "vector"]], "circle-test": [[16, "sphere"], [32, "sphere"], [48, "vector"], [64, "vector"]],
"move-target-from-pad": [[16, "vector"], [32, "vector"], [48, "matrix"]],
"draw-sprite2d-xy": [[16, "draw-context"]], "draw-sprite2d-xy": [[16, "draw-context"]],
"screen-gradient": [[16, "draw-context"]], "screen-gradient": [[16, "draw-context"]],

1
decompiler/util/data_decompile.cpp
View file

@ -544,7 +544,6 @@ goos::Object bitfield_defs_print(const TypeSpec& type,
result.push_back(pretty_print::to_symbol(fmt::format("new 'static '{}", type.print()))); result.push_back(pretty_print::to_symbol(fmt::format("new 'static '{}", type.print())));
for (auto& def : defs) { for (auto& def : defs) {
if (def.enum_constant) { if (def.enum_constant) {
assert(false); // this is untested.
result.push_back( result.push_back(
pretty_print::to_symbol(fmt::format(":{} {}", def.field_name, *def.enum_constant))); pretty_print::to_symbol(fmt::format(":{} {}", def.field_name, *def.enum_constant)));
} else if (def.is_signed) { } else if (def.is_signed) {

2
goal_src/engine/math/vector-h.gc
View file

@ -281,7 +281,7 @@
;; Vector of 16 signed bytes ;; Vector of 16 signed bytes
(deftype vector16b (structure) (deftype vector16b (structure)
((data int8 8 :offset-assert 0) ((data int8 16 :offset-assert 0)
(quad uint128 :offset 0) (quad uint128 :offset 0)
) )
:method-count-assert 9 :method-count-assert 9

61
goal_src/engine/ps2/pad.gc
View file

@ -5,6 +5,27 @@
;; name in dgo: pad ;; name in dgo: pad
;; dgos: GAME, ENGINE ;; dgos: GAME, ENGINE
(defenum pad-buttons
:bitfield #t
:type uint32
(select 0)
(l3 1)
(r3 2)
(start 3)
(up 4)
(right 5)
(down 6)
(left 7)
(l2 8)
(r2 9)
(l1 10)
(r1 11)
(triangle 12)
(circle 13)
(x 14)
(square 15)
)
;; these forward declarations should probably go somewhere else... ;; these forward declarations should probably go somewhere else...
(define-extern get-current-time (function uint)) (define-extern get-current-time (function uint))
(define-extern get-integral-current-time (function uint)) (define-extern get-integral-current-time (function uint))
@ -31,22 +52,22 @@
;; data from hardware + additional info calculated here. ;; data from hardware + additional info calculated here.
(deftype cpad-info (hw-cpad) (deftype cpad-info (hw-cpad)
((number int32 :offset-assert 36) ((number int32 :offset-assert 36)
(cpad-file int32 :offset-assert 40) (cpad-file int32 :offset-assert 40)
(button0-abs uint32 3 :offset-assert 44) ;; bitmask of buttons, pressed or not, with history (button0-abs pad-buttons 3 :offset-assert 44) ;; bitmask of buttons, pressed or not, with history
(button0-shadow-abs uint32 1 :offset-assert 56) ;; modify this to change button history in the future. (button0-shadow-abs pad-buttons 1 :offset-assert 56) ;; modify this to change button history in the future.
(button0-rel uint32 3 :offset-assert 60) ;; bitmask of if button going down. (button0-rel pad-buttons 3 :offset-assert 60) ;; bitmask of if button going down.
(stick0-dir float :offset-assert 72) (stick0-dir float :offset-assert 72)
(stick0-speed float :offset-assert 76) (stick0-speed float :offset-assert 76)
(new-pad int32 :offset-assert 80) (new-pad int32 :offset-assert 80)
(state int32 :offset-assert 84) (state int32 :offset-assert 84)
(align uint8 6 :offset-assert 88) (align uint8 6 :offset-assert 88)
(direct uint8 6 :offset-assert 94) ;; hardware control of buzzing. (direct uint8 6 :offset-assert 94) ;; hardware control of buzzing.
(buzz-val uint8 2 :offset-assert 100) ;; intensity for buzzing (buzz-val uint8 2 :offset-assert 100) ;; intensity for buzzing
(buzz-time uint64 2 :offset-assert 104) ;; when to stop buzzing (buzz-time uint64 2 :offset-assert 104) ;; when to stop buzzing
(buzz basic :offset-assert 120) ;; is vibration enabled? (buzz basic :offset-assert 120) ;; is vibration enabled?
(buzz-act int32 :offset-assert 124) (buzz-act int32 :offset-assert 124)
(change-time uint64 :offset-assert 128) (change-time uint64 :offset-assert 128)
) )
(:methods (:methods
(new (symbol type int) _type_ 0) (new (symbol type int) _type_ 0)
@ -60,9 +81,9 @@
"Reset all data in a cpad-info" "Reset all data in a cpad-info"
(set! (-> pad valid) (logior (-> pad valid) 128)) (set! (-> pad valid) (logior (-> pad valid) 128))
(set! (-> pad button0) (the-as uint 0)) (set! (-> pad button0) (the-as uint 0))
(set! (-> pad button0-abs 0) (the-as uint 0)) (set! (-> pad button0-abs 0) (pad-buttons))
(set! (-> pad button0-shadow-abs 0) (the-as uint 0)) (set! (-> pad button0-shadow-abs 0) (pad-buttons))
(set! (-> pad button0-rel 0) (the-as uint 0)) (set! (-> pad button0-rel 0) (pad-buttons))
(dotimes (v1-2 12) (dotimes (v1-2 12)
(nop!) (nop!)
(set! (-> pad abutton v1-2) 0) (set! (-> pad abutton v1-2) 0)
@ -238,7 +259,7 @@
(set! (-> pad button0-rel 2) (-> pad button0-rel 1)) (set! (-> pad button0-rel 2) (-> pad button0-rel 1))
(set! (-> pad button0-rel 1) (-> pad button0-rel 0)) (set! (-> pad button0-rel 1) (-> pad button0-rel 0))
;; update current button ;; update current button
(let ((current-button0 (-> pad button0))) (let ((current-button0 (the pad-buttons (-> pad button0))))
(set! (-> pad button0-shadow-abs 0) current-button0) (set! (-> pad button0-shadow-abs 0) current-button0)
(set! (-> pad button0-abs 0) current-button0) (set! (-> pad button0-abs 0) current-button0)
) )

21
test/decompiler/reference/all_forward_declarations.gc
View file

@ -288,6 +288,27 @@
(define-extern set-display (function display int int int int int display)) (define-extern set-display (function display int int int int int display))
(define-extern *display* display) (define-extern *display* display)
;; pad
(defenum pad-buttons
:bitfield #t
:type uint32
(select 0)
(l3 1)
(r3 2)
(start 3)
(up 4)
(right 5)
(down 6)
(left 7)
(l2 8)
(r2 9)
(l1 10)
(r1 11)
(triangle 12)
(circle 13)
(x 14)
(square 15)
)
;; vector ;; vector
;; only because trig isn't in the reference yet. ;; only because trig isn't in the reference yet.

106
test/decompiler/reference/euler_REF.gc
View file

@ -27,9 +27,7 @@
(when (= (logand (sar (the int (-> s5-0 data 3)) 2) 1) 1) (when (= (logand (sar (the int (-> s5-0 data 3)) 2) 1) 1)
(set! (-> s5-0 data 0) (- (-> s5-0 data 0))) (set! (-> s5-0 data 0) (- (-> s5-0 data 0)))
(set! (-> s5-0 data 1) (- (-> s5-0 data 1))) (set! (-> s5-0 data 1) (- (-> s5-0 data 1)))
(let ((f0-10 (- (-> s5-0 data 2)))) (set! (-> s5-0 data 2) (- (-> s5-0 data 2)))
(set! (-> s5-0 data 2) f0-10)
)
) )
(let* ((f26-0 (cos (-> s5-0 data 0))) (let* ((f26-0 (cos (-> s5-0 data 0)))
(f30-0 (cos (-> s5-0 data 1))) (f30-0 (cos (-> s5-0 data 1)))
@ -127,16 +125,14 @@
) )
(+ f1-1 (* f30-0 f2-0)) (+ f1-1 (* f30-0 f2-0))
) )
(let ((f0-19 (+ (- f3-0) (* f30-0 f0-17)))) (set!
(set! (->
(-> (the-as
(the-as (pointer float)
(pointer float) (+ (+ (shl v1-17 4) (shl v1-17 2)) (the-as int arg0))
(+ (+ (shl v1-17 4) (shl v1-17 2)) (the-as int arg0))
)
) )
f0-19
) )
(+ (- f3-0) (* f30-0 f0-17))
) )
) )
(else (else
@ -212,16 +208,14 @@
) )
(* f30-0 f24-0) (* f30-0 f24-0)
) )
(let ((f0-25 (* f30-0 f26-0))) (set!
(set! (->
(-> (the-as
(the-as (pointer float)
(pointer float) (+ (+ (shl v1-17 4) (shl v1-17 2)) (the-as int arg0))
(+ (+ (shl v1-17 4) (shl v1-17 2)) (the-as int arg0))
)
) )
f0-25
) )
(* f30-0 f26-0)
) )
) )
) )
@ -296,27 +290,24 @@
) )
) )
) )
(let (set!
((f0-13 (-> arg0 data 2)
(atan (atan
(-> (->
(the-as (the-as
(pointer float) (pointer float)
(+ (+ (shl s3-0 2) (shl s2-0 4)) (the-as int arg1)) (+ (+ (shl s3-0 2) (shl s2-0 4)) (the-as int arg1))
) )
) )
(- (-
(-> (->
(the-as (the-as
(pointer float) (pointer float)
(+ (+ (shl s3-0 2) (shl s1-0 4)) (the-as int arg1)) (+ (+ (shl s3-0 2) (shl s1-0 4)) (the-as int arg1))
)
)
) )
) )
) )
) )
(set! (-> arg0 data 2) f0-13)
) )
) )
(else (else
@ -351,9 +342,7 @@
) )
) )
) )
(let ((f0-20 0.0)) (set! (-> arg0 data 2) 0.0)
(set! (-> arg0 data 2) f0-20)
)
) )
) )
) )
@ -410,25 +399,22 @@
f30-1 f30-1
) )
) )
(let (set!
((f0-34 (-> arg0 data 2)
(atan (atan
(-> (->
(the-as (the-as
(pointer float) (pointer float)
(+ (+ (shl s3-0 2) (shl s2-0 4)) (the-as int arg1)) (+ (+ (shl s3-0 2) (shl s2-0 4)) (the-as int arg1))
) )
) )
(-> (->
(the-as (the-as
(pointer float) (pointer float)
(+ (+ (shl s3-0 2) (shl s3-0 4)) (the-as int arg1)) (+ (+ (shl s3-0 2) (shl s3-0 4)) (the-as int arg1))
)
)
) )
) )
) )
(set! (-> arg0 data 2) f0-34)
) )
) )
(else (else
@ -465,9 +451,7 @@
f30-1 f30-1
) )
) )
(let ((f0-42 0.0)) (set! (-> arg0 data 2) 0.0)
(set! (-> arg0 data 2) f0-42)
)
) )
) )
) )
@ -476,9 +460,7 @@
(when (= (logand (sar arg2 2) 1) 1) (when (= (logand (sar arg2 2) 1) 1)
(set! (-> arg0 data 0) (- (-> arg0 data 0))) (set! (-> arg0 data 0) (- (-> arg0 data 0)))
(set! (-> arg0 data 1) (- (-> arg0 data 1))) (set! (-> arg0 data 1) (- (-> arg0 data 1)))
(let ((f0-48 (- (-> arg0 data 2)))) (set! (-> arg0 data 2) (- (-> arg0 data 2)))
(set! (-> arg0 data 2) f0-48)
)
) )
(if (= (logand arg2 1) 1) (if (= (logand arg2 1) 1)
(let ((f0-49 (-> arg0 data 0))) (let ((f0-49 (-> arg0 data 0)))
@ -511,5 +493,3 @@

4
test/decompiler/reference/matrix_REF.gc
View file

@ -809,9 +809,7 @@
(set! (-> dst data 12) 0.0) (set! (-> dst data 12) 0.0)
(set! (-> dst data 13) 0.0) (set! (-> dst data 13) 0.0)
(set! (-> dst data 14) 0.0) (set! (-> dst data 14) 0.0)
(let ((f0-12 1.0)) (set! (-> dst data 15) 1.0)
(set! (-> dst data 15) f0-12)
)
dst dst
) )

58
test/decompiler/reference/pad_REF.gc
View file

@ -38,22 +38,22 @@
;; definition of type cpad-info ;; definition of type cpad-info
(deftype cpad-info (hw-cpad) (deftype cpad-info (hw-cpad)
((number int32 :offset-assert 36) ((number int32 :offset-assert 36)
(cpad-file int32 :offset-assert 40) (cpad-file int32 :offset-assert 40)
(button0-abs uint32 3 :offset-assert 44) (button0-abs pad-buttons 3 :offset-assert 44)
(button0-shadow-abs uint32 1 :offset-assert 56) (button0-shadow-abs pad-buttons 1 :offset-assert 56)
(button0-rel uint32 3 :offset-assert 60) (button0-rel pad-buttons 3 :offset-assert 60)
(stick0-dir float :offset-assert 72) (stick0-dir float :offset-assert 72)
(stick0-speed float :offset-assert 76) (stick0-speed float :offset-assert 76)
(new-pad int32 :offset-assert 80) (new-pad int32 :offset-assert 80)
(state int32 :offset-assert 84) (state int32 :offset-assert 84)
(align uint8 6 :offset-assert 88) (align uint8 6 :offset-assert 88)
(direct uint8 6 :offset-assert 94) (direct uint8 6 :offset-assert 94)
(buzz-val uint8 2 :offset-assert 100) (buzz-val uint8 2 :offset-assert 100)
(buzz-time uint64 2 :offset-assert 104) (buzz-time uint64 2 :offset-assert 104)
(buzz basic :offset-assert 120) (buzz basic :offset-assert 120)
(buzz-act int32 :offset-assert 124) (buzz-act int32 :offset-assert 124)
(change-time uint64 :offset-assert 128) (change-time uint64 :offset-assert 128)
) )
:method-count-assert 9 :method-count-assert 9
:size-assert #x88 :size-assert #x88
@ -98,9 +98,9 @@
(defun cpad-invalid! ((pad cpad-info)) (defun cpad-invalid! ((pad cpad-info))
(set! (-> pad valid) (logior (-> pad valid) 128)) (set! (-> pad valid) (logior (-> pad valid) 128))
(set! (-> pad button0) (the-as uint 0)) (set! (-> pad button0) (the-as uint 0))
(set! (-> pad button0-abs 0) (the-as uint 0)) (set! (-> pad button0-abs 0) (pad-buttons))
(set! (-> pad button0-shadow-abs 0) (the-as uint 0)) (set! (-> pad button0-shadow-abs 0) (pad-buttons))
(set! (-> pad button0-rel 0) (the-as uint 0)) (set! (-> pad button0-rel 0) (pad-buttons))
(dotimes (v1-2 12) (dotimes (v1-2 12)
(nop!) (nop!)
(set! (-> pad abutton v1-2) (the-as uint 0)) (set! (-> pad abutton v1-2) (the-as uint 0))
@ -292,12 +292,18 @@
(set! (-> pad button0-rel 2) (-> pad button0-rel 1)) (set! (-> pad button0-rel 2) (-> pad button0-rel 1))
(set! (-> pad button0-rel 1) (-> pad button0-rel 0)) (set! (-> pad button0-rel 1) (-> pad button0-rel 0))
(let ((current-button0 (-> pad button0))) (let ((current-button0 (-> pad button0)))
(set! (-> pad button0-shadow-abs 0) current-button0) (set!
(set! (-> pad button0-abs 0) current-button0) (-> pad button0-shadow-abs 0)
(the-as pad-buttons current-button0)
)
(set! (-> pad button0-abs 0) (the-as pad-buttons current-button0))
) )
(set! (set!
(-> pad button0-rel 0) (-> pad button0-rel 0)
(logand (-> pad button0-abs 0) (lognot (-> pad button0-abs 1))) (logand
(-> pad button0-abs 0)
(the-as uint (lognot (-> pad button0-abs 1)))
)
) )
(when *cpad-debug* (when *cpad-debug*
(set! (-> pad leftx) (the-as uint 255)) (set! (-> pad leftx) (the-as uint 255))
@ -318,9 +324,7 @@
) )
) )
(if (< (-> pad stick0-speed) 0.3) (if (< (-> pad stick0-speed) 0.3)
(let ((f0-8 0.0)) (set! (-> pad stick0-speed) 0.0)
(set! (-> pad stick0-speed) f0-8)
)
) )
) )
(else (else
@ -329,9 +333,7 @@
(set! (-> pad rightx) (the-as uint 128)) (set! (-> pad rightx) (the-as uint 128))
(set! (-> pad righty) (the-as uint 128)) (set! (-> pad righty) (the-as uint 128))
(set! (-> pad stick0-dir) 0.0) (set! (-> pad stick0-dir) 0.0)
(let ((f0-10 0.0)) (set! (-> pad stick0-speed) 0.0)
(set! (-> pad stick0-speed) f0-10)
)
) )
) )
(if (if

49
test/decompiler/reference/quaternion_REF.gc
View file

@ -461,9 +461,7 @@
(let ((f0-5 (/ 0.5 f0-4))) (let ((f0-5 (/ 0.5 f0-4)))
(set! (-> arg0 x) (* f0-5 (- (-> arg1 data 6) (-> arg1 data 9)))) (set! (-> arg0 x) (* f0-5 (- (-> arg1 data 6) (-> arg1 data 9))))
(set! (-> arg0 y) (* f0-5 (- (-> arg1 data 8) (-> arg1 data 2)))) (set! (-> arg0 y) (* f0-5 (- (-> arg1 data 8) (-> arg1 data 2))))
(let ((f0-6 (* f0-5 (- (-> arg1 data 1) (-> arg1 data 4))))) (set! (-> arg0 z) (* f0-5 (- (-> arg1 data 1) (-> arg1 data 4))))
(set! (-> arg0 z) f0-6)
)
) )
) )
(let ((a2-0 0) (let ((a2-0 0)
@ -564,28 +562,25 @@
f0-12 f0-12
) )
) )
(let (set!
((f0-13 (-> arg0 data v1-1)
(* (*
(+ (+
(-> (->
(the-as (the-as
(pointer float) (pointer float)
(+ (+ (shl v1-1 2) (shl a2-0 4)) (the-as int arg1)) (+ (+ (shl v1-1 2) (shl a2-0 4)) (the-as int arg1))
) )
) )
(-> (->
(the-as (the-as
(pointer float) (pointer float)
(+ (+ (shl a2-0 2) (shl v1-1 4)) (the-as int arg1)) (+ (+ (shl a2-0 2) (shl v1-1 4)) (the-as int arg1))
)
)
) )
f0-12
) )
) )
f0-12
) )
(set! (-> arg0 data v1-1) f0-13)
) )
) )
) )
@ -718,9 +713,7 @@
) )
(set! (-> arg0 x) (* (-> arg1 x) f0-9)) (set! (-> arg0 x) (* (-> arg1 x) f0-9))
(set! (-> arg0 y) (* (-> arg1 y) f0-9)) (set! (-> arg0 y) (* (-> arg1 y) f0-9))
(let ((f0-10 (* (-> arg1 z) f0-9))) (set! (-> arg0 z) (* (-> arg1 z) f0-9))
(set! (-> arg0 z) f0-10)
)
) )
) )
) )
@ -735,9 +728,7 @@
(set! (-> arg0 x) 0.0) (set! (-> arg0 x) 0.0)
(set! (-> arg0 y) 0.0) (set! (-> arg0 y) 0.0)
(set! (-> arg0 z) 0.0) (set! (-> arg0 z) 0.0)
(let ((f0-4 1.0)) (set! (-> arg0 w) 1.0)
(set! (-> arg0 w) f0-4)
)
) )
(else (else
(let ((s5-0 (new 'stack-no-clear 'vector))) (let ((s5-0 (new 'stack-no-clear 'vector)))
@ -747,9 +738,7 @@
(set! (-> arg0 y) (* (-> arg1 y) f0-6)) (set! (-> arg0 y) (* (-> arg1 y) f0-6))
(set! (-> arg0 z) (* (-> arg1 z) f0-6)) (set! (-> arg0 z) (* (-> arg1 z) f0-6))
) )
(let ((f0-8 (-> s5-0 data 1))) (set! (-> arg0 w) (-> s5-0 data 1))
(set! (-> arg0 w) f0-8)
)
) )
) )
) )

31
test/decompiler/reference/sync-info_REF.gc
View file

@ -9,9 +9,8 @@
(set! (-> obj period) arg0) (set! (-> obj period) arg0)
(let* ((f0-1 (the float arg0)) (let* ((f0-1 (the float arg0))
(f1-1 (* arg1 f0-1)) (f1-1 (* arg1 f0-1))
(f0-3 (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1)))
) )
(set! (-> obj offset) f0-3) (set! (-> obj offset) (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1)))
) )
0 0
) )
@ -24,9 +23,8 @@
(set! (-> obj period) arg0) (set! (-> obj period) arg0)
(let* ((f0-1 (the float arg0)) (let* ((f0-1 (the float arg0))
(f1-1 (* arg1 f0-1)) (f1-1 (* arg1 f0-1))
(f0-3 (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1)))
) )
(set! (-> obj offset) f0-3) (set! (-> obj offset) (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1)))
) )
(if (< arg2 0.0) (if (< arg2 0.0)
(set! arg2 0.0) (set! arg2 0.0)
@ -71,9 +69,8 @@
(set! (-> obj period) arg0) (set! (-> obj period) arg0)
(let* ((f0-1 (the float arg0)) (let* ((f0-1 (the float arg0))
(f1-1 (* arg1 f0-1)) (f1-1 (* arg1 f0-1))
(f0-3 (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1)))
) )
(set! (-> obj offset) f0-3) (set! (-> obj offset) (- f1-1 (* (the float (the int (/ f1-1 f0-1))) f0-1)))
) )
(cond (cond
((< arg2 0.0) ((< arg2 0.0)
@ -371,8 +368,9 @@
) )
(set! (-> obj start-time) (-> *display* base-frame-counter)) (set! (-> obj start-time) (-> *display* base-frame-counter))
(set! (-> obj timer) (rand-vu-int-range (-> obj min-time) (-> obj max-time))) (set! (-> obj timer) (rand-vu-int-range (-> obj min-time) (-> obj max-time)))
(let ((f0-3 (rand-vu-float-range (- (-> obj max-val)) (-> obj max-val)))) (set!
(set! (-> obj value) f0-3) (-> obj value)
(rand-vu-float-range (- (-> obj max-val)) (-> obj max-val))
) )
) )
(-> obj value) (-> obj value)
@ -409,10 +407,9 @@
(fmin (-> obj max-vel) (fmax (- (-> obj max-vel)) (-> obj vel))) (fmin (-> obj max-vel) (fmax (- (-> obj max-vel)) (-> obj vel)))
) )
(set! (-> obj vel) (* (-> obj vel) (-> obj damping))) (set! (-> obj vel) (* (-> obj vel) (-> obj damping)))
(let (set!
((f0-10 (+ (-> obj value) (* (-> obj vel) (-> *display* time-adjust-ratio)))) (-> obj value)
) (+ (-> obj value) (* (-> obj vel) (-> *display* time-adjust-ratio)))
(set! (-> obj value) f0-10)
) )
(-> obj value) (-> obj value)
) )
@ -445,18 +442,14 @@
(when (>= (-> obj osc value) (-> obj max-value)) (when (>= (-> obj osc value) (-> obj max-value))
(set! (-> obj osc value) (-> obj max-value)) (set! (-> obj osc value) (-> obj max-value))
(if (< 0.0 (-> obj osc vel)) (if (< 0.0 (-> obj osc vel))
(let ((f0-4 (* (-> obj osc vel) (- (-> obj elasticity))))) (set! (-> obj osc vel) (* (-> obj osc vel) (- (-> obj elasticity))))
(set! (-> obj osc vel) f0-4)
)
) )
(set! (-> obj state) 1) (set! (-> obj state) 1)
) )
(when (>= (-> obj min-value) (-> obj osc value)) (when (>= (-> obj min-value) (-> obj osc value))
(set! (-> obj osc value) (-> obj min-value)) (set! (-> obj osc value) (-> obj min-value))
(if (< (-> obj osc vel) 0.0) (if (< (-> obj osc vel) 0.0)
(let ((f0-9 (* (-> obj osc vel) (- (-> obj elasticity))))) (set! (-> obj osc vel) (* (-> obj osc vel) (- (-> obj elasticity))))
(set! (-> obj osc vel) f0-9)
)
) )
(set! (-> obj state) -1) (set! (-> obj state) -1)
) )
@ -711,3 +704,5 @@
(-> obj value) (-> obj value)
) )
) )

2
test/decompiler/reference/vector-h_REF.gc
View file

@ -417,7 +417,7 @@
;; definition of type vector16b ;; definition of type vector16b
(deftype vector16b (structure) (deftype vector16b (structure)
((data int8 8 :offset-assert 0) ((data int8 16 :offset-assert 0)
(quad uint128 :offset 0) (quad uint128 :offset 0)
) )
:method-count-assert 9 :method-count-assert 9

50
test/decompiler/reference/vector_REF.gc
View file

@ -320,16 +320,12 @@
(cond (cond
((>= max-step step-len) ((>= max-step step-len)
(set! (-> vec data 0) (+ (-> vec data 0) x-step)) (set! (-> vec data 0) (+ (-> vec data 0) x-step))
(let ((f0-4 (+ (-> vec data 2) z-step))) (set! (-> vec data 2) (+ (-> vec data 2) z-step))
(set! (-> vec data 2) f0-4)
)
) )
(else (else
(let ((f2-6 (/ max-step step-len))) (let ((f2-6 (/ max-step step-len)))
(set! (-> vec data 0) (+ (-> vec data 0) (* f2-6 x-step))) (set! (-> vec data 0) (+ (-> vec data 0) (* f2-6 x-step)))
(let ((f0-6 (+ (-> vec data 2) (* f2-6 z-step)))) (set! (-> vec data 2) (+ (-> vec data 2) (* f2-6 z-step)))
(set! (-> vec data 2) f0-6)
)
) )
) )
) )
@ -354,16 +350,12 @@
(cond (cond
((>= max-step step-len) ((>= max-step step-len)
(set! (-> vec data 1) (+ (-> vec data 1) y-step)) (set! (-> vec data 1) (+ (-> vec data 1) y-step))
(let ((f0-4 (+ (-> vec data 2) z-step))) (set! (-> vec data 2) (+ (-> vec data 2) z-step))
(set! (-> vec data 2) f0-4)
)
) )
(else (else
(let ((step-scale (/ max-step step-len))) (let ((step-scale (/ max-step step-len)))
(set! (-> vec data 1) (+ (-> vec data 1) (* step-scale y-step))) (set! (-> vec data 1) (+ (-> vec data 1) (* step-scale y-step)))
(let ((f0-6 (+ (-> vec data 2) (* step-scale z-step)))) (set! (-> vec data 2) (+ (-> vec data 2) (* step-scale z-step)))
(set! (-> vec data 2) f0-6)
)
) )
) )
) )
@ -395,17 +387,13 @@
((>= max-step step-len) ((>= max-step step-len)
(set! (-> vec data 0) (+ (-> vec data 0) x-step)) (set! (-> vec data 0) (+ (-> vec data 0) x-step))
(set! (-> vec data 1) (+ (-> vec data 1) y-step)) (set! (-> vec data 1) (+ (-> vec data 1) y-step))
(let ((f0-5 (+ (-> vec data 2) z-step))) (set! (-> vec data 2) (+ (-> vec data 2) z-step))
(set! (-> vec data 2) f0-5)
)
) )
(else (else
(let ((step-scale (/ max-step step-len))) (let ((step-scale (/ max-step step-len)))
(set! (-> vec data 0) (+ (-> vec data 0) (* step-scale x-step))) (set! (-> vec data 0) (+ (-> vec data 0) (* step-scale x-step)))
(set! (-> vec data 1) (+ (-> vec data 1) (* step-scale y-step))) (set! (-> vec data 1) (+ (-> vec data 1) (* step-scale y-step)))
(let ((f0-7 (+ (-> vec data 2) (* step-scale z-step)))) (set! (-> vec data 2) (+ (-> vec data 2) (* step-scale z-step)))
(set! (-> vec data 2) f0-7)
)
) )
) )
) )
@ -815,9 +803,7 @@
(let ((v1-1 (/ arg2 f0-0))) (let ((v1-1 (/ arg2 f0-0)))
(set! (-> arg0 data 0) (* (-> arg1 data 0) v1-1)) (set! (-> arg0 data 0) (* (-> arg1 data 0) v1-1))
(set! (-> arg0 data 1) (* (-> arg1 data 1) v1-1)) (set! (-> arg0 data 1) (* (-> arg1 data 1) v1-1))
(let ((f0-7 (* (-> arg1 data 2) v1-1))) (set! (-> arg0 data 2) (* (-> arg1 data 2) v1-1))
(set! (-> arg0 data 2) f0-7)
)
) )
) )
) )
@ -831,9 +817,7 @@
(if (!= f0-0 0.0) (if (!= f0-0 0.0)
(let ((v1-1 (/ arg1 f0-0))) (let ((v1-1 (/ arg1 f0-0)))
(set! (-> arg0 data 0) (* (-> arg0 data 0) v1-1)) (set! (-> arg0 data 0) (* (-> arg0 data 0) v1-1))
(let ((f0-5 (* (-> arg0 data 2) v1-1))) (set! (-> arg0 data 2) (* (-> arg0 data 2) v1-1))
(set! (-> arg0 data 2) f0-5)
)
) )
) )
) )
@ -848,9 +832,7 @@
(when (!= f0-0 0.0) (when (!= f0-0 0.0)
(set! (-> arg0 data 0) (/ (-> arg0 data 0) f0-0)) (set! (-> arg0 data 0) (/ (-> arg0 data 0) f0-0))
(set! (-> arg0 data 1) (/ (-> arg0 data 1) f0-0)) (set! (-> arg0 data 1) (/ (-> arg0 data 1) f0-0))
(let ((f0-1 (/ (-> arg0 data 2) f0-0))) (set! (-> arg0 data 2) (/ (-> arg0 data 2) f0-0))
(set! (-> arg0 data 2) f0-1)
)
) )
) )
) )
@ -864,9 +846,7 @@
(set! f0-0 (/ f0-0 arg1)) (set! f0-0 (/ f0-0 arg1))
(when (!= f0-0 0.0) (when (!= f0-0 0.0)
(set! (-> arg0 data 0) (/ (-> arg0 data 0) f0-0)) (set! (-> arg0 data 0) (/ (-> arg0 data 0) f0-0))
(let ((f0-1 (/ (-> arg0 data 2) f0-0))) (set! (-> arg0 data 2) (/ (-> arg0 data 2) f0-0))
(set! (-> arg0 data 2) f0-1)
)
) )
) )
) )
@ -925,9 +905,8 @@
(set! (-> arg0 data 1) f0-0) (set! (-> arg0 data 1) f0-0)
(let* ((f26-0 (- f0-0)) (let* ((f26-0 (- f0-0))
(f0-4 (- (* f28-0 (cos f26-0)) (* f30-0 (sin f26-0)))) (f0-4 (- (* f28-0 (cos f26-0)) (* f30-0 (sin f26-0))))
(f0-5 (atan (- (-> arg1 data 1)) f0-4))
) )
(set! (-> arg0 data 0) f0-5) (set! (-> arg0 data 0) (atan (- (-> arg1 data 1)) f0-4))
) )
) )
(set! (-> arg0 data 2) 0.0) (set! (-> arg0 data 2) 0.0)
@ -943,9 +922,8 @@
(set! (-> arg0 data 0) f0-1) (set! (-> arg0 data 0) f0-1)
(let* ((f26-0 (- f0-1)) (let* ((f26-0 (- f0-1))
(f0-5 (- (* f28-0 (cos f26-0)) (* f30-0 (sin f26-0)))) (f0-5 (- (* f28-0 (cos f26-0)) (* f30-0 (sin f26-0))))
(f0-6 (atan (-> arg1 data 0) f0-5))
) )
(set! (-> arg0 data 1) f0-6) (set! (-> arg0 data 1) (atan (-> arg1 data 0) f0-5))
) )
) )
(set! (-> arg0 data 2) 0.0) (set! (-> arg0 data 2) 0.0)
@ -1171,9 +1149,7 @@
(-> out data 2) (-> out data 2)
(deg-lerp-clamp (-> min-val data 2) (-> max-val data 2) in) (deg-lerp-clamp (-> min-val data 2) (-> max-val data 2) in)
) )
(let ((f0-11 1.0)) (set! (-> out data 3) 1.0)
(set! (-> out data 3) f0-11)
)
) )
) )
out out

110
test/decompiler/test_FormExpressionBuild2.cpp
View file

@ -1025,3 +1025,113 @@ TEST_F(FormRegressionTest, DmaBucketInsertTag) {
" [3, \"a0\", \"dma-bucket\"]\n" " [3, \"a0\", \"dma-bucket\"]\n"
" ]"); " ]");
} }
TEST_F(FormRegressionTest, StupidFloatMove) {
std::string func =
"sll r0, r0, 0\n"
" daddiu sp, sp, -48\n"
" sd ra, 0(sp)\n"
" sd fp, 8(sp)\n"
" or fp, t9, r0\n"
" sq s5, 16(sp)\n"
" sq gp, 32(sp)\n"
" or gp, a0, r0\n"
//" lwc1 f0, L47(fp)\n"
" mtc1 f0, r0\n"
" mtc1 f1, a1\n"
" min.s f0, f0, f1\n"
" mfc1 s5, f0\n"
" mtc1 f0, s5\n"
" swc1 f0, 900(gp)\n"
" lw t9, get-video-mode(s7)\n"
" jalr ra, t9\n"
" sll v0, ra, 0\n"
" or v1, v0, r0\n"
" daddiu a0, s7, pal\n"
" bne v1, a0, L37\n"
" sll r0, r0, 0\n"
//" lwc1 f0, L42(fp)\n"
" mtc1 f0, r0\n"
" mtc1 f1, s5\n"
" mul.s f0, f0, f1\n"
" swc1 f0, 916(gp)\n"
//" lwc1 f0, L43(fp)\n"
" mtc1 f0, r0\n"
" mtc1 f1, s5\n"
" mul.s f0, f0, f1\n"
" swc1 f0, 904(gp)\n"
//" lwc1 f0, L46(fp)\n"
" mtc1 f0, r0\n"
//" lwc1 f1, L50(fp)\n"
" mtc1 f1, r0\n"
" mtc1 f2, s5\n"
" div.s f1, f1, f2\n"
" mul.s f0, f0, f1\n"
" swc1 f0, 908(gp)\n"
//" lwc1 f0, L49(fp)\n"
" mtc1 f0, r0\n"
" swc1 f0, 912(gp)\n"
" mfc1 v1, f0\n"
" beq r0, r0, L38\n"
" sll r0, r0, 0\n"
"L37:\n"
" mtc1 f0, s5\n"
" swc1 f0, 916(gp)\n"
//" lwc1 f0, L44(fp)\n"
" mtc1 f0, r0\n"
" mtc1 f1, s5\n"
" mul.s f0, f0, f1\n"
" swc1 f0, 904(gp)\n"
//" lwc1 f0, L45(fp)\n"
" mtc1 f0, r0\n"
//" lwc1 f1, L50(fp)\n"
" mtc1 f1, r0\n"
" mtc1 f2, s5\n"
" div.s f1, f1, f2\n"
" mul.s f0, f0, f1\n"
" swc1 f0, 908(gp)\n"
//" lwc1 f0, L48(fp)\n"
" mtc1 f0, r0\n"
" swc1 f0, 912(gp)\n"
" mfc1 v1, f0\n"
"L38:\n"
//" lwc1 f0, 900(gp)\n"
" mtc1 f0, r0\n"
" mfc1 v0, f0\n"
" ld ra, 0(sp)\n"
" ld fp, 8(sp)\n"
" lq gp, 32(sp)\n"
" lq s5, 16(sp)\n"
" jr ra\n"
" daddiu sp, sp, 48";
std::string type = "(function display float float)";
std::string expected =
"(begin\n"
" (let ((s5-0 (fmin 0.0 arg1)))\n"
" (set! (-> arg0 time-ratio) s5-0)\n"
" (let ((v1-0 (get-video-mode)))\n"
" (cond\n"
" ((= v1-0 (quote pal))\n"
" (set! (-> arg0 time-adjust-ratio) (* 0.0 s5-0))\n"
" (set! (-> arg0 seconds-per-frame) (* 0.0 s5-0))\n"
" (set! (-> arg0 frames-per-second) (* 0.0 (/ 0.0 s5-0)))\n"
" (set! (-> arg0 time-factor) 0.0)\n"
" )\n"
" (else\n"
" (set! (-> arg0 time-adjust-ratio) s5-0)\n"
" (set! (-> arg0 seconds-per-frame) (* 0.0 s5-0))\n"
" (set! (-> arg0 frames-per-second) (* 0.0 (/ 0.0 s5-0)))\n"
" (set! (-> arg0 time-factor) 0.0)\n"
" )\n"
" )\n"
" )\n"
" )\n"
" 0.0\n"
" )";
test_with_expr(func, type, expected);
}