mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 21:27:52 -04:00
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>
57 lines
1 KiB
Common Lisp
57 lines
1 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: ramdisk.gc
|
|
;; name in dgo: ramdisk
|
|
;; dgos: ENGINE, GAME
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype ramdisk-rpc-fill (structure)
|
|
((rsvd1 int32)
|
|
(ee-id int32)
|
|
(rsvd2 int32 2)
|
|
(filename uint128)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype ramdisk-rpc-load (structure)
|
|
((rsvd int32)
|
|
(ee-id int32)
|
|
(offset uint32)
|
|
(length uint32)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype ramdisk-rpc-load-to-ee (structure)
|
|
((rsvd int32)
|
|
(addr int32)
|
|
(offset int32)
|
|
(length int32)
|
|
(filename uint128)
|
|
)
|
|
)
|
|
|
|
|
|
(define *ramdisk-rpc* (new 'global 'rpc-buffer-pair (the-as uint 32) (the-as uint 1) 2))
|
|
|
|
(define *current-ramdisk-id* 0)
|
|
|
|
(defun ramdisk-load ((arg0 int) (arg1 uint) (arg2 uint) (arg3 pointer))
|
|
(let ((v1-1 (the-as ramdisk-rpc-load (add-element *ramdisk-rpc*))))
|
|
(set! (-> v1-1 offset) arg1)
|
|
(set! (-> v1-1 ee-id) arg0)
|
|
(set! (-> v1-1 length) arg2)
|
|
)
|
|
(call *ramdisk-rpc* (the-as uint 0) arg3 arg2)
|
|
0
|
|
)
|
|
|
|
(defun ramdisk-sync ()
|
|
(sync *ramdisk-rpc* #t)
|
|
0
|
|
(none)
|
|
)
|