mirror of
https://github.com/open-goal/jak-project
synced 2026-09-01 17:59:55 -04:00
deftype and defmethod syntax major changes (#3094)
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>
This commit is contained in:
@@ -39,11 +39,11 @@
|
||||
obj
|
||||
)
|
||||
|
||||
(defmethod mem-usage object ((this object) (arg0 memory-usage-block) (arg1 int))
|
||||
(defmethod mem-usage ((this object) (arg0 memory-usage-block) (arg1 int))
|
||||
this
|
||||
)
|
||||
|
||||
(defmethod calculate-total memory-usage-block ((this memory-usage-block))
|
||||
(defmethod calculate-total ((this memory-usage-block))
|
||||
"@returns The total sum of all [[memory-usage-info]] `total`s"
|
||||
(let ((sum 0))
|
||||
(dotimes (idx (-> this length))
|
||||
@@ -53,7 +53,7 @@
|
||||
)
|
||||
)
|
||||
|
||||
(defmethod reset! memory-usage-block ((this memory-usage-block))
|
||||
(defmethod reset! ((this memory-usage-block))
|
||||
"Sets `length` to 0 as well as resets all fields except `name` in the associated [[memory-usage-info]]"
|
||||
(set! (-> this length) 0)
|
||||
(dotimes (idx 112)
|
||||
@@ -78,7 +78,7 @@
|
||||
)
|
||||
)
|
||||
|
||||
(defmethod compute-memory-usage! level ((this level) (force? symbol))
|
||||
(defmethod compute-memory-usage! ((this level) (force? symbol))
|
||||
"Calculates the memory usage of the level, returns and stores the [[memory-usage-block]]
|
||||
in `mem-usage-block` as well as the total size in `mem-usage`
|
||||
|
||||
@@ -97,7 +97,7 @@ in `mem-usage-block` as well as the total size in `mem-usage`
|
||||
(-> this mem-usage-block)
|
||||
)
|
||||
|
||||
(defmethod mem-usage process-tree ((this process-tree) (arg0 memory-usage-block) (arg1 int))
|
||||
(defmethod mem-usage ((this process-tree) (arg0 memory-usage-block) (arg1 int))
|
||||
(let ((v1-0 90))
|
||||
(let* ((a0-1 *dead-pool-list*)
|
||||
(a3-0 (car a0-1))
|
||||
@@ -310,7 +310,7 @@ in `mem-usage-block` as well as the total size in `mem-usage`
|
||||
|
||||
(define *max-dma* 0)
|
||||
|
||||
(defmethod print-mem-usage memory-usage-block ((this memory-usage-block) (level level) (fmt-dest object))
|
||||
(defmethod print-mem-usage ((this memory-usage-block) (level level) (fmt-dest object))
|
||||
(local-vars (sv-16 object) (sv-32 string) (sv-48 int))
|
||||
(let ((s3-0 (&- (-> level heap current) (the-as uint (-> level heap base)))))
|
||||
(let ((v1-2 (+ (-> this data 61 total) (-> this data 62 total))))
|
||||
|
||||
Reference in New Issue
Block a user