mirror of
https://github.com/open-goal/jak-project
synced 2026-08-17 05:31:46 -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.6 KiB
Common Lisp
Vendored
Generated
103 lines
3.6 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition for symbol *vu1-enable-user-menu*, type vu1-renderer-mask
|
|
(define *vu1-enable-user-menu* (vu1-renderer-mask
|
|
sky
|
|
ocean
|
|
ocean-wave
|
|
tfrag
|
|
tie-near
|
|
tie
|
|
generic
|
|
merc
|
|
shrubbery
|
|
shrub-near
|
|
billboard
|
|
trans-shrubbery
|
|
trans-tfrag
|
|
sprite
|
|
shadow
|
|
depth-cue
|
|
nineteen
|
|
twenty
|
|
)
|
|
)
|
|
|
|
;; definition for symbol *vu1-enable-user*, type vu1-renderer-mask
|
|
(define *vu1-enable-user* (the-as vu1-renderer-mask 0))
|
|
|
|
;; definition of type dma-foreground-sink
|
|
(deftype dma-foreground-sink (basic)
|
|
((bucket bucket-id)
|
|
(foreground-texture-page int8)
|
|
(foreground-texture-level int8)
|
|
(foreground-output-bucket int8)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type dma-foreground-sink
|
|
(defmethod inspect ((this dma-foreground-sink))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tbucket: ~D~%" (-> this bucket))
|
|
(format #t "~Tforeground-texture-page: ~D~%" (-> this foreground-texture-page))
|
|
(format #t "~Tforeground-texture-level: ~D~%" (-> this foreground-texture-level))
|
|
(format #t "~Tforeground-output-bucket: ~D~%" (-> this foreground-output-bucket))
|
|
this
|
|
)
|
|
|
|
;; definition of type generic-bucket-state
|
|
(deftype generic-bucket-state (structure)
|
|
((gifbuf-adr uint32)
|
|
(inbuf-adr uint32)
|
|
)
|
|
:pack-me
|
|
)
|
|
|
|
;; definition for method 3 of type generic-bucket-state
|
|
(defmethod inspect ((this generic-bucket-state))
|
|
(format #t "[~8x] ~A~%" this 'generic-bucket-state)
|
|
(format #t "~Tgifbuf-adr: ~D~%" (-> this gifbuf-adr))
|
|
(format #t "~Tinbuf-adr: ~D~%" (-> this inbuf-adr))
|
|
this
|
|
)
|
|
|
|
;; definition of type generic-dma-foreground-sink
|
|
(deftype generic-dma-foreground-sink (dma-foreground-sink)
|
|
((state generic-bucket-state :inline)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type generic-dma-foreground-sink
|
|
(defmethod inspect ((this generic-dma-foreground-sink))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tbucket: ~D~%" (-> this bucket))
|
|
(format #t "~Tforeground-texture-page: ~D~%" (-> this foreground-texture-page))
|
|
(format #t "~Tforeground-texture-level: ~D~%" (-> this foreground-texture-level))
|
|
(format #t "~Tforeground-output-bucket: ~D~%" (-> this foreground-output-bucket))
|
|
(format #t "~Tstate: #<generic-bucket-state @ #x~X>~%" (-> this state))
|
|
this
|
|
)
|
|
|
|
;; definition of type dma-foreground-sink-group
|
|
(deftype dma-foreground-sink-group (basic)
|
|
((sink dma-foreground-sink 3)
|
|
(merc-sink dma-foreground-sink :overlay-at (-> sink 0))
|
|
(generic-sink generic-dma-foreground-sink :overlay-at (-> sink 1))
|
|
(level level)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type dma-foreground-sink-group
|
|
(defmethod inspect ((this dma-foreground-sink-group))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tsink[3] @ #x~X~%" (-> this sink))
|
|
(format #t "~Tmerc-sink: ~A~%" (-> this merc-sink))
|
|
(format #t "~Tgeneric-sink: ~A~%" (-> this generic-sink))
|
|
(format #t "~Tlevel: ~A~%" (-> this level))
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|