mirror of
https://github.com/open-goal/jak-project
synced 2026-07-10 23:22:17 -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>
146 lines
4.9 KiB
Common Lisp
Vendored
Generated
146 lines
4.9 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type lbvtx
|
|
(deftype lbvtx (structure)
|
|
((x float)
|
|
(y float)
|
|
(z float)
|
|
(v0 uint8)
|
|
(v1 uint8)
|
|
(v2 uint8)
|
|
(ix uint8)
|
|
(quad uint128 :overlay-at x)
|
|
(v vector :inline :overlay-at x)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type lbvtx
|
|
;; INFO: Used lq/sq
|
|
(defmethod inspect ((this lbvtx))
|
|
(format #t "[~8x] ~A~%" this 'lbvtx)
|
|
(format #t "~Tx: ~f~%" (-> this x))
|
|
(format #t "~Ty: ~f~%" (-> this y))
|
|
(format #t "~Tz: ~f~%" (-> this z))
|
|
(format #t "~Tv0: ~D~%" (-> this v0))
|
|
(format #t "~Tv1: ~D~%" (-> this v1))
|
|
(format #t "~Tv2: ~D~%" (-> this v2))
|
|
(format #t "~Tix: ~D~%" (-> this ix))
|
|
(format #t "~Tquad: ~D~%" (-> this quad))
|
|
(format #t "~Tv: #<vector @ #x~X>~%" (&-> this x))
|
|
this
|
|
)
|
|
|
|
;; definition of type load-boundary-crossing-command
|
|
(deftype load-boundary-crossing-command (structure)
|
|
((cmd load-boundary-cmd)
|
|
(bparm uint8 3)
|
|
(parm uint32 2)
|
|
(lev0 basic :overlay-at (-> parm 0))
|
|
(lev1 basic :overlay-at (-> parm 1))
|
|
(displev basic :overlay-at (-> parm 0))
|
|
(dispcmd basic :overlay-at (-> parm 1))
|
|
(nick basic :overlay-at (-> parm 0))
|
|
(forcelev basic :overlay-at (-> parm 0))
|
|
(forceonoff basic :overlay-at (-> parm 1))
|
|
(checkname basic :overlay-at (-> parm 0))
|
|
)
|
|
:pack-me
|
|
)
|
|
|
|
;; definition for method 3 of type load-boundary-crossing-command
|
|
(defmethod inspect ((this load-boundary-crossing-command))
|
|
(format #t "[~8x] ~A~%" this 'load-boundary-crossing-command)
|
|
(format #t "~Tcmd: ~D~%" (-> this cmd))
|
|
(format #t "~Tbparm[3] @ #x~X~%" (-> this bparm))
|
|
(format #t "~Tparm[2] @ #x~X~%" (-> this parm))
|
|
(format #t "~Tlev0: ~A~%" (-> this lev0))
|
|
(format #t "~Tlev1: ~A~%" (-> this lev1))
|
|
(format #t "~Tdisplev: ~A~%" (-> this lev0))
|
|
(format #t "~Tdispcmd: ~A~%" (-> this lev1))
|
|
(format #t "~Tnick: ~A~%" (-> this lev0))
|
|
(format #t "~Tforcelev: ~A~%" (-> this lev0))
|
|
(format #t "~Tforceonoff: ~A~%" (-> this lev1))
|
|
(format #t "~Tcheckname: ~A~%" (-> this lev0))
|
|
this
|
|
)
|
|
|
|
;; definition of type load-boundary
|
|
(deftype load-boundary (basic)
|
|
((num-points uint16)
|
|
(flags load-boundary-flags)
|
|
(top-plane float)
|
|
(bot-plane float)
|
|
(tri-cnt int32)
|
|
(next load-boundary)
|
|
(cmd-fwd load-boundary-crossing-command :inline)
|
|
(cmd-bwd load-boundary-crossing-command :inline)
|
|
(rejector vector :inline)
|
|
(data lbvtx 1 :inline)
|
|
(data2 lbvtx :inline :dynamic :overlay-at (-> data 0))
|
|
)
|
|
(:methods
|
|
(new (symbol type int symbol symbol) _type_)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type load-boundary
|
|
(defmethod inspect ((this load-boundary))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tnum-points: ~D~%" (-> this num-points))
|
|
(format #t "~Tflags: ~D~%" (-> this flags))
|
|
(format #t "~Ttop-plane: ~f~%" (-> this top-plane))
|
|
(format #t "~Tbot-plane: ~f~%" (-> this bot-plane))
|
|
(format #t "~Ttri-cnt: ~D~%" (-> this tri-cnt))
|
|
(format #t "~Tnext: ~A~%" (-> this next))
|
|
(format #t "~Tcmd-fwd: #<load-boundary-crossing-command @ #x~X>~%" (-> this cmd-fwd))
|
|
(format #t "~Tcmd-bwd: #<load-boundary-crossing-command @ #x~X>~%" (-> this cmd-bwd))
|
|
(format #t "~Trejector: #<vector @ #x~X>~%" (-> this rejector))
|
|
(format #t "~Tdata[1] @ #x~X~%" (-> this data))
|
|
this
|
|
)
|
|
|
|
;; definition for symbol *load-boundary-list*, type load-boundary
|
|
(define *load-boundary-list* (the-as load-boundary #f))
|
|
|
|
;; definition for symbol *load-boundary-target*, type (inline-array lbvtx)
|
|
(define *load-boundary-target* (the-as (inline-array lbvtx) (malloc 'global 64)))
|
|
|
|
;; definition for method 0 of type load-boundary
|
|
;; INFO: Used lq/sq
|
|
(defmethod new load-boundary ((allocation symbol) (type-to-make type) (arg0 int) (arg1 symbol) (arg2 symbol))
|
|
(let ((v0-0 (object-new allocation type-to-make (the-as int (+ (-> type-to-make size) (* (+ arg0 -1) 16))))))
|
|
(set! (-> v0-0 num-points) (the-as uint arg0))
|
|
(cond
|
|
(arg1
|
|
(set! (-> v0-0 flags) (load-boundary-flags closed))
|
|
)
|
|
(else
|
|
(set! (-> v0-0 flags) (load-boundary-flags))
|
|
0
|
|
)
|
|
)
|
|
(set! (-> v0-0 top-plane) 524288.0)
|
|
(set! (-> v0-0 bot-plane) -524288.0)
|
|
(dotimes (v1-4 arg0)
|
|
(set! (-> v0-0 data v1-4 quad) (the-as uint128 0))
|
|
(set! (-> v0-0 data v1-4 ix) (the-as uint v1-4))
|
|
)
|
|
(set! (-> v0-0 tri-cnt) 0)
|
|
(set-vector! (-> v0-0 rejector) 0.0 0.0 0.0 268435460.0)
|
|
(set! (-> v0-0 cmd-fwd cmd) (load-boundary-cmd invalid))
|
|
(set! (-> v0-0 cmd-bwd cmd) (load-boundary-cmd invalid))
|
|
(when arg2
|
|
(set! (-> v0-0 next) *load-boundary-list*)
|
|
(set! *load-boundary-list* v0-0)
|
|
)
|
|
(if (not arg2)
|
|
(set! (-> v0-0 next) #f)
|
|
)
|
|
v0-0
|
|
)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|