mirror of
https://github.com/open-goal/jak-project
synced 2026-06-06 19:52:01 -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>
75 lines
2.2 KiB
Common Lisp
Vendored
Generated
75 lines
2.2 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type matrix
|
|
(deftype matrix (structure)
|
|
((vector vector 4 :inline :offset 0)
|
|
(quad uint128 4 :overlay-at vector)
|
|
(data float 16 :overlay-at vector)
|
|
)
|
|
(:methods
|
|
(transform-vectors! (_type_ (inline-array vector) (inline-array vector) int) none)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type matrix
|
|
;; INFO: this function exists in multiple non-identical object files
|
|
(defmethod inspect ((this matrix))
|
|
(format #t "[~8x] ~A~%" this 'matrix)
|
|
(format #t "~Tdata[16] @ #x~X~%" (-> this vector))
|
|
(format #t "~Tvector[4] @ #x~X~%" (-> this vector))
|
|
(format #t "~Tquad[4] @ #x~X~%" (-> this vector))
|
|
this
|
|
)
|
|
|
|
;; definition of type matrix3
|
|
(deftype matrix3 (structure)
|
|
((data float 12)
|
|
(vector vector 3 :inline :overlay-at (-> data 0))
|
|
(quad uint128 3 :overlay-at (-> data 0))
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type matrix3
|
|
;; INFO: this function exists in multiple non-identical object files
|
|
(defmethod inspect ((this matrix3))
|
|
(format #t "[~8x] ~A~%" this 'matrix3)
|
|
(format #t "~Tdata[12] @ #x~X~%" (-> this data))
|
|
(format #t "~Tvector[3] @ #x~X~%" (-> this data))
|
|
(format #t "~Tquad[3] @ #x~X~%" (-> this data))
|
|
this
|
|
)
|
|
|
|
;; definition of type matrix4h
|
|
(deftype matrix4h (structure)
|
|
((data int16 16)
|
|
(vector4h vector4h 4 :inline :overlay-at (-> data 0))
|
|
(long int64 4 :overlay-at (-> data 0))
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type matrix4h
|
|
(defmethod inspect ((this matrix4h))
|
|
(format #t "[~8x] ~A~%" this 'matrix4h)
|
|
(format #t "~Tdata[16] @ #x~X~%" (-> this data))
|
|
(format #t "~Tvector4h[4] @ #x~X~%" (-> this data))
|
|
(format #t "~Tlong[4] @ #x~X~%" (-> this data))
|
|
this
|
|
)
|
|
|
|
;; definition for function matrix-copy!
|
|
;; INFO: Used lq/sq
|
|
(defun matrix-copy! ((arg0 matrix) (arg1 matrix))
|
|
(let ((v1-0 (-> arg1 vector 0 quad))
|
|
(a2-0 (-> arg1 vector 1 quad))
|
|
(a3-0 (-> arg1 vector 2 quad))
|
|
(a1-1 (-> arg1 vector 3 quad))
|
|
)
|
|
(set! (-> arg0 vector 0 quad) v1-0)
|
|
(set! (-> arg0 vector 1 quad) a2-0)
|
|
(set! (-> arg0 vector 2 quad) a3-0)
|
|
(set! (-> arg0 vector 3 quad) a1-1)
|
|
)
|
|
arg0
|
|
)
|