mirror of
https://github.com/open-goal/jak-project
synced 2026-08-11 11:33:51 -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>
60 lines
2.5 KiB
Common Lisp
Vendored
Generated
60 lines
2.5 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type blit-displays-work
|
|
(deftype blit-displays-work (structure)
|
|
((adgif-tmpl dma-gif-packet :inline)
|
|
(sprite-tmpl dma-gif-packet :inline)
|
|
(sprite-slow-tmpl dma-gif-packet :inline)
|
|
(line-tmpl dma-gif-packet :inline)
|
|
(scan-tmpl dma-gif-packet :inline)
|
|
(color vector4w :inline)
|
|
(line-color uint64)
|
|
(scan-colors vector4w 15 :inline)
|
|
(menu-mode symbol)
|
|
(screen-copied symbol)
|
|
(vu1-enable-user-menu vu1-renderer-mask)
|
|
(texture-enable-user-menu uint32)
|
|
(count-down uint32)
|
|
(horizontal-flip-flag symbol)
|
|
(scan-alpha float)
|
|
(scanline uint32)
|
|
(progress-interp float)
|
|
(progress-interp-dest float)
|
|
(progress-interp-speed float)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type blit-displays-work
|
|
(defmethod inspect ((this blit-displays-work))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(format #t "[~8x] ~A~%" this 'blit-displays-work)
|
|
(format #t "~1Tadgif-tmpl: #<dma-gif-packet @ #x~X>~%" (-> this adgif-tmpl))
|
|
(format #t "~1Tsprite-tmpl: #<dma-gif-packet @ #x~X>~%" (-> this sprite-tmpl))
|
|
(format #t "~1Tsprite-slow-tmpl: #<dma-gif-packet @ #x~X>~%" (-> this sprite-slow-tmpl))
|
|
(format #t "~1Tline-tmpl: #<dma-gif-packet @ #x~X>~%" (-> this line-tmpl))
|
|
(format #t "~1Tscan-tmpl: #<dma-gif-packet @ #x~X>~%" (-> this scan-tmpl))
|
|
(format #t "~1Tcolor: #<vector4w @ #x~X>~%" (-> this color))
|
|
(format #t "~1Tline-color: ~D~%" (-> this line-color))
|
|
(format #t "~1Tscan-colors[15] @ #x~X~%" (-> this scan-colors))
|
|
(format #t "~1Tmenu-mode: ~A~%" (-> this menu-mode))
|
|
(format #t "~1Tscreen-copied: ~A~%" (-> this screen-copied))
|
|
(format #t "~1Tvu1-enable-user-menu: ~D~%" (-> this vu1-enable-user-menu))
|
|
(format #t "~1Ttexture-enable-user-menu: ~D~%" (-> this texture-enable-user-menu))
|
|
(format #t "~1Tcount-down: ~D~%" (-> this count-down))
|
|
(format #t "~1Thorizontal-flip-flag: ~A~%" (-> this horizontal-flip-flag))
|
|
(format #t "~1Tscan-alpha: ~f~%" (-> this scan-alpha))
|
|
(format #t "~1Tscanline: ~D~%" (-> this scanline))
|
|
(format #t "~1Tprogress-interp: ~f~%" (-> this progress-interp))
|
|
(format #t "~1Tprogress-interp-dest: ~f~%" (-> this progress-interp-dest))
|
|
(format #t "~1Tprogress-interp-speed: ~f~%" (-> this progress-interp-speed))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|