mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-21 23:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get started on collide-func and clean up log forms in decompiler (#713)

Browse Source 
* wip

* temp

* temp2

* first part of log macros

* more log macros

* logtest

* clean up

* dont initialize game info because we are missing stuff
This commit is contained in:
water111
2021-07-23 20:51:26 -04:00
committed by GitHub
parent 65b61d05e6
commit 95366d21df
73 changed files with 1900 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/kernel/gcommon_REF.gc
+4 -7
View File
@@ -853,12 +853,9 @@
(defun mem-or! ((dst pointer) (src pointer) (size int))
(let ((result dst))
(dotimes (i size)
(set!
(logior!
(-> (the-as (pointer uint8) dst))
(logior
(-> (the-as (pointer uint8) dst))
(-> (the-as (pointer uint8) src))
)
(-> (the-as (pointer uint8) src))
)
(&+! dst 1)
(&+! src 1)
@@ -966,7 +963,7 @@
(cond
((not expected-type)
(cond
((nonzero? (logand (the-as int obj) 3))
((logtest? (the-as int obj) 3)
(if name
(format
print-dest
@@ -998,7 +995,7 @@
)
((= expected-type structure)
(cond
((nonzero? (logand (the-as int obj) 15))
((logtest? (the-as int obj) 15)
(if name
(format
print-dest
test/decompiler/reference/kernel/gkernel_REF.gc
+23 -30
View File
@@ -209,31 +209,31 @@
;; definition (debug) for function stream<-process-mask
(defun-debug stream<-process-mask ((arg0 object) (arg1 process-mask))
(let ((s4-0 arg1))
(if (= (logand #x1000000 (the-as int s4-0)) (process-mask death))
(if (= (logand #x1000000 s4-0) (process-mask death))
(format arg0 "death ")
)
(if (= (logand #x800000 (the-as int s4-0)) (process-mask attackable))
(if (= (logand #x800000 s4-0) (process-mask attackable))
(format arg0 "attackable ")
)
(if (= (logand #x400000 (the-as int s4-0)) (process-mask projectile))
(if (= (logand #x400000 s4-0) (process-mask projectile))
(format arg0 "projectile ")
)
(if (= (logand #x200000 (the-as int s4-0)) (process-mask entity))
(if (= (logand #x200000 s4-0) (process-mask entity))
(format arg0 "entity ")
)
(if (= (logand #x100000 (the-as int s4-0)) (process-mask ambient))
(if (= (logand #x100000 s4-0) (process-mask ambient))
(format arg0 "ambient ")
)
(if (= (logand #x80000 (the-as int s4-0)) (process-mask platform))
(if (= (logand #x80000 s4-0) (process-mask platform))
(format arg0 "platform ")
)
(if (= (logand #x40000 (the-as int s4-0)) (process-mask camera))
(if (= (logand #x40000 s4-0) (process-mask camera))
(format arg0 "camera ")
)
(if (= (logand #x20000 (the-as int s4-0)) (process-mask enemy))
(if (= (logand #x20000 s4-0) (process-mask enemy))
(format arg0 "enemy ")
)
(if (= (logand #x10000 (the-as int s4-0)) (process-mask collectable))
(if (= (logand #x10000 s4-0) (process-mask collectable))
(format arg0 "collectable ")
)
(if (= (logand s4-0 (process-mask crate)) (process-mask crate))
@@ -990,7 +990,7 @@
(when
(not
(or
(nonzero? (logand (-> arg0 mask) (process-mask heap-shrunk)))
(logtest? (-> arg0 mask) (process-mask heap-shrunk))
(and (not (-> arg0 next-state)) (not (-> arg0 state)))
)
)
@@ -1003,7 +1003,7 @@
(< (the-as int arg0) (the-as int (gap-location obj (-> obj first-gap))))
(set! (-> obj first-gap) (find-gap obj (the-as dead-pool-heap-rec s5-0)))
)
(set! (-> arg0 mask) (logior (-> arg0 mask) (process-mask heap-shrunk)))
(logior! (-> arg0 mask) (process-mask heap-shrunk))
)
(if (= (-> obj first-shrink) s5-0)
(set! (-> obj first-shrink) (the-as dead-pool-heap-rec (-> s5-0 2)))
@@ -1250,10 +1250,7 @@
((arg0 process-tree) (arg1 (function object object)) (arg2 kernel-context))
(let
((s4-0
(or
(nonzero? (logand (-> arg0 mask) (process-mask process-tree)))
(arg1 arg0)
)
(or (logtest? (-> arg0 mask) (process-mask process-tree)) (arg1 arg0))
)
)
(cond
@@ -1281,10 +1278,10 @@
(let
((s3-0
(or
(nonzero? (logand (-> arg0 mask) (process-mask process-tree)))
(logtest? (-> arg0 mask) (process-mask process-tree))
(not
(and
(zero? (logand (-> arg2 prevent-from-run) (the-as uint (-> arg0 mask))))
(zero? (logand (-> arg2 prevent-from-run) (-> arg0 mask)))
(run-logic? arg0)
)
)
@@ -1355,11 +1352,9 @@
(('waiting-to-run 'suspended)
(set! (-> s5-0 current-process) arg0)
(cond
((nonzero?
(logand
(-> arg0 mask)
(process-mask pause)
)
((logtest?
(-> arg0 mask)
(process-mask pause)
)
(set! *stdcon* *stdcon1*)
(set! *debug-draw-pauseable* #t)
@@ -1394,11 +1389,9 @@
)
)
(if
(nonzero?
(logand
(-> arg0 mask)
(process-mask sleep-code)
)
(logtest?
(-> arg0 mask)
(process-mask sleep-code)
)
(set! (-> arg0 status) 'suspended)
((-> arg0 main-thread resume-hook)
@@ -1710,9 +1703,9 @@
((obj process) (arg0 process-tree) (arg1 basic) (arg2 pointer))
(set!
(-> obj mask)
(logand
(lognot (process-mask sleep sleep-code process-tree heap-shrunk))
(logclear
(-> arg0 mask)
(process-mask sleep sleep-code process-tree heap-shrunk)
)
)
(set! (-> obj status) 'ready)
@@ -1734,7 +1727,7 @@
(set! (-> obj event-hook) #f)
(set! (-> obj state) #f)
(set! (-> obj next-state) #f)
(if (nonzero? (logand (-> arg0 mask) (process-mask process-tree)))
(if (logtest? (-> arg0 mask) (process-mask process-tree))
(set! (-> obj entity) #f)
(set! (-> obj entity) (-> (the-as process arg0) entity))
)
test/decompiler/reference/kernel/gstate_REF.gc
+3 -6
View File
@@ -64,11 +64,8 @@
)
(local-vars (s7-0 none) (sp-0 none) (sp-1 int) (ra-0 int) (sv-0 none))
(with-pp
(set!
(-> pp mask)
(logand (lognot (process-mask sleep sleep-code)) (-> pp mask))
)
(set! (-> pp mask) (logior (-> pp mask) (process-mask going)))
(logclear! (-> pp mask) (process-mask sleep sleep-code))
(logior! (-> pp mask) (process-mask going))
(cond
((= (-> pp status) 'initialize)
(set! (-> pp trans-hook) #f)
@@ -97,7 +94,7 @@
(set! s0-1 (-> s0-1 next))
)
)
(set! (-> pp mask) (logand (lognot (process-mask going)) (-> pp mask)))
(logclear! (-> pp mask) (process-mask going))
(let ((s0-2 (-> pp state)))
(set! (-> pp event-hook) (-> s0-2 event))
(if (-> s0-2 exit)