mirror of
https://github.com/open-goal/jak-project
synced 2026-05-23 23:05:43 -04:00
ManDude
cd68cb671e
Major change to how `deftype` shows up in our code: - the decompiler will no longer emit the `offset-assert`, `method-count-assert`, `size-assert` and `flag-assert` parameters. There are extremely few cases where having this in the decompiled code is helpful, as the types there come from `all-types` which already has those parameters. This also doesn't break type consistency because: - the asserts aren't compared. - the first step of the test uses `all-types`, which has the asserts, which will throw an error if they're bad. - the decompiler won't emit the `heap-base` parameter unless necessary now. - the decompiler will try its hardest to turn a fixed-offset field into an `overlay-at` field. It falls back to the old offset if all else fails. - `overlay-at` now supports field "dereferencing" to specify the offset that's within a field that's a structure, e.g.: ```lisp (deftype foobar (structure) ((vec vector :inline) (flags int32 :overlay-at (-> vec w)) ) ) ``` in this structure, the offset of `flags` will be 12 because that is the final offset of `vec`'s `w` field within this structure. - **removed ID from all method declarations.** IDs are only ever automatically assigned now. Fixes #3068. - added an `:overlay` parameter to method declarations, in order to declare a new method that goes on top of a previously-defined method. Syntax is `:overlay <method-name>`. Please do not ever use this. - added `state-methods` list parameter. This lets you quickly specify a list of states to be put in the method table. Same syntax as the `states` list parameter. The decompiler will try to put as many states in this as it can without messing with the method ID order. Also changes `defmethod` to make the first type definition (before the arguments) optional. The type can now be inferred from the first argument. Fixes #3093. --------- Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
103 lines
3.5 KiB
Common Lisp
Vendored
Generated
103 lines
3.5 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type debug-sphere-table
|
|
(deftype debug-sphere-table (basic)
|
|
((point vector 300 :inline)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type debug-sphere-table
|
|
(defmethod inspect ((this debug-sphere-table))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tpoint[300] @ #x~X~%" (-> this point))
|
|
this
|
|
)
|
|
|
|
;; definition for function make-debug-sphere-table
|
|
;; INFO: Used lq/sq
|
|
;; INFO: Return type mismatch int vs none.
|
|
(defun make-debug-sphere-table ((arg0 debug-sphere-table))
|
|
(local-vars (sv-80 int))
|
|
(let ((s5-0 (new-stack-vector0))
|
|
(f30-0 1.0)
|
|
(s4-0 0)
|
|
)
|
|
(set-vector! s5-0 0.0 0.0 0.0 1.0)
|
|
(dotimes (s3-0 10)
|
|
(let ((f28-0 (* f30-0 (sin (* 3276.8 (the float s3-0)))))
|
|
(f26-0 (* f30-0 (sin (* 3276.8 (the float (+ s3-0 1))))))
|
|
(s2-0 (new-stack-vector0))
|
|
(s1-0 (new-stack-vector0))
|
|
(s0-0 (new-stack-vector0))
|
|
)
|
|
(set! (-> s2-0 y) (+ (-> s5-0 y) (* (cos (* 3276.8 (the float s3-0))) f30-0)))
|
|
(set! (-> s1-0 y) (-> s2-0 y))
|
|
(set! (-> s0-0 y) (+ (-> s5-0 y) (* (cos (* 3276.8 (the float (+ s3-0 1)))) f30-0)))
|
|
(set! sv-80 0)
|
|
(while (< sv-80 10)
|
|
(set! (-> s2-0 x) (+ (-> s5-0 x) (* (cos (* 6553.6 (the float sv-80))) f28-0)))
|
|
(set! (-> s2-0 z) (+ (-> s5-0 z) (* (sin (* 6553.6 (the float sv-80))) f28-0)))
|
|
(set! (-> s1-0 x) (+ (-> s5-0 x) (* (cos (* 6553.6 (the float (+ sv-80 1)))) f28-0)))
|
|
(set! (-> s1-0 z) (+ (-> s5-0 z) (* (sin (* 6553.6 (the float (+ sv-80 1)))) f28-0)))
|
|
(set! (-> s0-0 x) (+ (-> s5-0 x) (* (cos (* 6553.6 (the float sv-80))) f26-0)))
|
|
(set! (-> s0-0 z) (+ (-> s5-0 z) (* (sin (* 6553.6 (the float sv-80))) f26-0)))
|
|
(set! (-> arg0 point s4-0 quad) (-> s2-0 quad))
|
|
(set! (-> arg0 point (+ s4-0 1) quad) (-> s1-0 quad))
|
|
(set! (-> arg0 point (+ s4-0 2) quad) (-> s0-0 quad))
|
|
(+! s4-0 3)
|
|
(set! sv-80 (+ sv-80 1))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
;; definition for symbol *debug-sphere-table*, type debug-sphere-table
|
|
(define *debug-sphere-table* (new 'static 'debug-sphere-table))
|
|
|
|
;; failed to figure out what this is:
|
|
(make-debug-sphere-table *debug-sphere-table*)
|
|
|
|
;; definition for function add-debug-sphere-from-table
|
|
;; INFO: Used lq/sq
|
|
;; INFO: Return type mismatch int vs none.
|
|
(defun add-debug-sphere-from-table ((arg0 bucket-id) (arg1 vector) (arg2 float) (arg3 rgba))
|
|
(rlet ((vf1 :class vf)
|
|
(vf2 :class vf)
|
|
(vf3 :class vf)
|
|
(vf4 :class vf)
|
|
(vf5 :class vf)
|
|
)
|
|
(let ((s4-0 (new-stack-vector0))
|
|
(s3-0 (new-stack-vector0))
|
|
(s2-0 (new-stack-vector0))
|
|
(points (-> *debug-sphere-table* point))
|
|
)
|
|
(.lvf vf1 (&-> arg1 quad))
|
|
(.mov vf2 arg2)
|
|
(dotimes (s0-0 100)
|
|
(.lvf vf3 (&-> points 0 quad))
|
|
(.lvf vf4 (&-> points 1 quad))
|
|
(.lvf vf5 (&-> points 2 quad))
|
|
(set! points (the-as (inline-array vector) (-> points 3)))
|
|
(.mul.x.vf vf3 vf3 vf2)
|
|
(.mul.x.vf vf4 vf4 vf2)
|
|
(.mul.x.vf vf5 vf5 vf2)
|
|
(.add.vf vf3 vf3 vf1)
|
|
(.add.vf vf4 vf4 vf1)
|
|
(.add.vf vf5 vf5 vf1)
|
|
(.svf (&-> s4-0 quad) vf3)
|
|
(.svf (&-> s3-0 quad) vf4)
|
|
(.svf (&-> s2-0 quad) vf5)
|
|
(add-debug-line #t arg0 s4-0 s3-0 arg3 #f (the-as rgba -1))
|
|
(add-debug-line #t arg0 s4-0 s2-0 arg3 #f (the-as rgba -1))
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
)
|