mirror of
https://github.com/open-goal/jak-project
synced 2026-06-20 16:21:35 -04:00
Tyler Wilding
c162c66118
This PR does two main things: 1. Work through the main low-hanging fruit issues in the formatter keeping it from feeling mature and usable 2. Iterate and prove that point by formatting all of the Jak 1 code base. **This has removed around 100K lines in total.** - The decompiler will now format it's results for jak 1 to keep things from drifting back to where they were. This is controlled by a new config flag `format_code`. How am I confident this hasn't broken anything?: - I compiled the entire project and stored it's `out/jak1/obj` files separately - I then recompiled the project after formatting and wrote a script that md5's each file and compares it (`compare-compilation-outputs.py` - The results (eventually) were the same:  > This proves that the only difference before and after is non-critical whitespace for all code/macros that is actually in use. I'm still aware of improvements that could be made to the formatter, as well as general optimization of it's performance. But in general these are for rare or non-critical situations in my opinion and I'll work through them before doing Jak 2. The vast majority looks great and is working properly at this point. Those known issues are the following if you are curious: 
102 lines
4.1 KiB
Common Lisp
102 lines
4.1 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "ENGINE.CGO" "GAME.CGO")
|
|
(require "kernel/gkernel.gc")
|
|
(require "engine/gfx/hw/gs.gc")
|
|
|
|
;; Functions for taking a screenshot of VRAM.
|
|
;; These are debug-only and leak memory.
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
;; this file is debug only
|
|
(declare-file (debug))
|
|
|
|
;; vif/gif tags to do a transfer of data from VRAM to EE memory.
|
|
(deftype gs-store-image-packet (structure)
|
|
((vifcode vif-tag 4)
|
|
(giftag gif-tag)
|
|
(bitbltbuf gs-bitbltbuf)
|
|
(bitbltbuf-addr gs-reg64)
|
|
(trxpos gs-trxpos)
|
|
(trxpos-addr gs-reg64)
|
|
(trxreg gs-trxreg)
|
|
(trxreg-addr gs-reg64)
|
|
(finish int64)
|
|
(finish-addr gs-reg64)
|
|
(trxdir gs-trxdir)
|
|
(trxdir-addr gs-reg64)))
|
|
|
|
(defun gs-set-default-store-image ((packet gs-store-image-packet) (src-fbp int) (src-w int) (src-psm int) (ssax int) (ssay int) (rrw int) (rrh int))
|
|
"Set up a gs-store-image-packet for storing"
|
|
;; nop
|
|
(set! (-> packet vifcode 0) (new 'static 'vif-tag :cmd (vif-cmd nop)))
|
|
;; set mskpath3
|
|
(set! (-> packet vifcode 1) (new 'static 'vif-tag :imm #x8000 :cmd (vif-cmd mskpath3)))
|
|
;; flush!
|
|
(set! (-> packet vifcode 2) (new 'static 'vif-tag :cmd (vif-cmd flusha) :msk #x1))
|
|
;; direct gif transfer.
|
|
(set! (-> packet vifcode 3) (new 'static 'vif-tag :imm #x6 :cmd (vif-cmd direct) :msk #x1))
|
|
;;gif a+d
|
|
(set! (-> packet giftag)
|
|
(the-as gif-tag
|
|
(make-u128 (new 'static 'gif-tag-regs :regs0 (gif-reg-id a+d)) (new 'static 'gif-tag64 :nloop #x5 :eop #x1 :nreg #x1))))
|
|
;; all the a+d
|
|
(set! (-> packet bitbltbuf) (new 'static 'gs-bitbltbuf :sbp src-fbp :sbw src-w :spsm src-psm))
|
|
(set! (-> packet bitbltbuf-addr) (gs-reg64 bitbltbuf))
|
|
(set! (-> packet trxpos) (new 'static 'gs-trxpos :ssax ssax :ssay ssay))
|
|
(set! (-> packet trxpos-addr) (gs-reg64 trxpos))
|
|
(set! (-> packet trxreg) (new 'static 'gs-trxreg :rrw rrw :rrh rrh))
|
|
(set! (-> packet trxreg-addr) (gs-reg64 trxreg))
|
|
(set! (-> packet finish) 0)
|
|
(set! (-> packet finish-addr) (gs-reg64 finish))
|
|
(set! (-> packet trxdir) (new 'static 'gs-trxdir :xdir #x1))
|
|
(set! (-> packet trxdir-addr) (gs-reg64 trxdir))
|
|
(.sync.l)
|
|
7)
|
|
|
|
(defun store-image ((oddeven int))
|
|
"Store an image to image.raw"
|
|
(local-vars (ptr-1 (pointer uint128)) (y-idx int) (y-idx-2 int))
|
|
(let ((width 512)
|
|
(height (-> *video-parms* screen-sy))
|
|
(file (new 'debug 'file-stream "image.raw" 'write)))
|
|
;; create (and leak memory) for 2 arrays.
|
|
(let ((buff0 (the-as (array uint128) (new 'debug 'boxed-array uint128 (/ (* width height) 4)))))
|
|
(let ((buff1 (the-as (array uint128) (new 'debug 'boxed-array uint128 (/ (* width height) 4)))))
|
|
;; set up a packet.
|
|
(let ((packet (new 'static 'gs-store-image-packet)))
|
|
;; capture one field
|
|
(gs-set-default-store-image packet #x2800 (/ width 64) 0 0 0 width height)
|
|
(flush-cache 0)
|
|
(gs-store-image packet (-> buff0 data))
|
|
(sync-path 0 0)
|
|
;; capture other field
|
|
(gs-set-default-store-image packet #x3000 (/ width 64) 0 0 0 width height)
|
|
(flush-cache 0)
|
|
(gs-store-image packet (-> buff1 data)))
|
|
;; wait for capture to complete.
|
|
(sync-path 0 0)
|
|
(let ((ptr-0 (-> buff0 data)))
|
|
(set! ptr-1 (-> buff1 data))
|
|
(cond
|
|
((zero? oddeven)
|
|
(set! y-idx 0)
|
|
(while (< y-idx height)
|
|
(file-stream-write file (&+ ptr-0 (* y-idx (* width 4))) (the-as uint (* width 4)))
|
|
(file-stream-write file (&+ ptr-1 (* y-idx (* width 4))) (the-as uint (* width 4)))
|
|
(set! y-idx (+ y-idx 1))))
|
|
(else
|
|
(set! y-idx-2 0)
|
|
(while (< y-idx-2 height)
|
|
(file-stream-write file (&+ ptr-1 (* y-idx-2 (* width 4))) (the-as uint (* width 4)))
|
|
(file-stream-write file (&+ ptr-0 (* y-idx-2 (* width 4))) (the-as uint (* width 4)))
|
|
(set! y-idx-2 (+ y-idx-2 1))))))
|
|
(format #t "oddeven = ~d~%" oddeven)
|
|
;; this does nothing.
|
|
(delete buff1))
|
|
;; also does nothing.
|
|
(delete buff0))
|
|
(file-stream-close file))
|
|
0)
|