From 0712e6d4db1ae965a17992cb53b69621bc2868a9 Mon Sep 17 00:00:00 2001 From: water111 <48171810+water111@users.noreply.github.com> Date: Sun, 16 Oct 2022 17:14:35 -0400 Subject: [PATCH] remove casts that were only needed to prevent hangs (#1977) --- decompiler/config/jak2/stack_structures.jsonc | 26 ------------------- .../jak2/engine/camera/cam-layout_REF.gc | 15 +++++++++++ 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/decompiler/config/jak2/stack_structures.jsonc b/decompiler/config/jak2/stack_structures.jsonc index e59b1cd934..c29178bd66 100644 --- a/decompiler/config/jak2/stack_structures.jsonc +++ b/decompiler/config/jak2/stack_structures.jsonc @@ -292,10 +292,6 @@ [16, "tracking-spline-sampler"], [32, "tracking-spline-sampler"] ], - "(method 20 tracking-spline)": [ - [16, "vector"], // hang without! - [32, "vector"] - ], "cam-calc-follow!": [ [16, "vector"], [32, "vector"], @@ -365,7 +361,6 @@ "cam-string-move": [[80, "collide-query"]], "(enter cam-string)": [[32, "collide-query"]], "cam-stick-code": [ - [608, "vector"], [64, "collide-query"] ], "(trans cam-stick)": [ @@ -630,18 +625,15 @@ ], "target-move-dist": [[16, "vector"]], "cam-layout-entity-volume-info-create": [ - // needed to prevent hang [32, "vector"], [48, "vector"], [64, "vector"], [80, "vector"], [96, "vector"], - [112, "vector"], [128, "vector"], [144, "vector"] ], "cam-layout-entity-info": [ - // needed to prevent a hang [16, "matrix"], [80, "vector"], [96, "vector"], @@ -662,7 +654,6 @@ [432, "vector"] ], "clmf-pos-rot": [ - // needed to prevent a hang [16, "vector"], [32, "vector"], [48, "matrix"], @@ -670,7 +661,6 @@ [176, "vector"] ], "(method 9 plane-volume)": [ - // needed to prevent a hang [16, "vector"], [32, "vector"], [48, "vector"], @@ -744,7 +734,6 @@ "execute-select": [[16, "vector"]], "(method 9 editable-array)": [[16, "vector"]], "execute-mouse-move": [ - // TODO - needed or hang occurs [80, "vector"], [96, "vector"], [112, "vector"], @@ -823,18 +812,6 @@ [48, "vector"], [64, "event-message-block"] ], - "(trans target-board-halfpipe)": [ - // stack guess hang - [16, "vector"], - [32, "vector"], - [48, "vector"] - ], - "(enter target-board-halfpipe)": [ - // stack guess hang - [16, "vector"], - [32, "vector"], - [48, "vector"] - ], "(enter target-board-grenade)": [[16, "vector"]], "(enter target-board-turn-to)": [ [16, "vector"], @@ -853,7 +830,6 @@ [96, "vector"] ], "(post target-slide-down-to-ground)": [ - // stack guess hang [16, "vector"], [32, "vector"], [48, "vector"], @@ -861,13 +837,11 @@ [80, "vector"] ], "(enter target-attack-air)": [ - // stack guess hang [16, "vector"], [32, "vector"], [48, "vector"] ], "(event target-attack-uppercut-jump)": [ - // stack guess hang [16, "vector"], [32, "vector"], [48, "vector"] diff --git a/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc b/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc index 5afac5b654..fd35fdb186 100644 --- a/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc +++ b/test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc @@ -352,6 +352,21 @@ ;; WARN: Stack slot offset 164 signed mismatch ;; WARN: Stack slot offset 164 signed mismatch ;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch +;; WARN: Stack slot offset 164 signed mismatch ;; WARN: new jak 2 until loop case, check carefully (defbehavior cam-layout-entity-volume-info-create cam-layout ((arg0 entity-camera) (arg1 symbol)) (local-vars