Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Latest updates to improve debugging for CD/SCD/ACD projects. #59

Merged
merged 7 commits into from
Dec 7, 2024
Merged

Latest updates to improve debugging for CD/SCD/ACD projects. #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ea216e6
Change isoLINK to ignore the "--asm" flag now that HuC overlays are i…
jbrandwood Dec 3, 2024
a95ecd0
Fix PCEAS's generation of .sym files for CD and SCD builds.
jbrandwood Dec 3, 2024
61992cb
Fix Visual Studio HuCC and PCEAS builds to use <direct.h> instead of …
jbrandwood Dec 3, 2024
b3617a6
Change PCEAS's .phase to use the current bank if the expression does …
jbrandwood Dec 5, 2024
bf32cdd
Update projects in examples/asm/elmer/ to generate Mesen2 debugging i…
jbrandwood Dec 6, 2024
f5b488a
Fix some typos in ipl-scd.asm
jbrandwood Dec 7, 2024
8e4a295
Change HuCC to make the is_small_array() check public.
jbrandwood Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/asm/elmer/cd-core-1stage/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ all: core-1stage.iso

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gL

SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
SRC_OVL = stage1.asm core-config.inc

SRC_ISO = stage1.ovl

core-1stage.iso: $(SRC_ISO)
$(IL) core-1stage.iso -ipl="1-Stage CD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)
$(IL) core-1stage.iso --ipl="1-Stage CD" $(SRC_ISO)

stage1.ovl: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -cd stage1.asm
$(AS) $(AFLAGS) --cd stage1.asm
8 changes: 4 additions & 4 deletions examples/asm/elmer/cd-core-2stage/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ all: core-2stage.iso

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA

SRC1_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
SRC1_OVL = core-stage1.asm core-config.inc
Expand All @@ -13,13 +13,13 @@ SRC2_OVL = stage2.asm core-config.inc
SRC_ISO = core-stage1.bin stage2.ovl

core-2stage.iso: $(SRC_ISO)
$(IL) core-2stage.iso -ipl="2-Stage CD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)
$(IL) core-2stage.iso --ipl="2-Stage CD" $(SRC_ISO)

core-stage1.bin core-stage1.sym: $(SRC1_OVL) $(SRC1_INC)
$(AS) $(AFLAGS) -cd -trim core-stage1.asm
$(AS) --cd --overlay --trim core-stage1.asm

core-stage1.s: core-stage1.s2i core-stage1.sym
$(S2I) core-stage1.s2i

stage2.ovl: $(SRC2_OVL) $(SRC2_INC) core-stage1.s
$(AS) $(AFLAGS) -cd stage2.asm
$(AS) $(AFLAGS) --cd stage2.asm
12 changes: 6 additions & 6 deletions examples/asm/elmer/cd-core-scsitest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ all: core-scsitest.iso scsitest.pce

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S
AFLAGS ?= --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm adpcm.asm cdrom.asm
SRC_OVL = scsitest.asm core-config.inc

SRC_ISO = scsitest.ovl ../data/alice.vdc ../data/alice.ram ../data/umbrella-16k.vox

core-scsitest.iso: $(SRC_ISO)
$(IL) core-scsitest.iso -ipl="test-CD CD-ROM2",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)

scsitest.ovl: $(SRC_OVL) $(SRC_INC) scsitest.pce
$(AS) $(AFLAGS) -cd -overlay scsitest.asm cdrom.asm
$(IL) core-scsitest.iso --ipl="test-CD CD-ROM2" $(SRC_ISO)

scsitest.pce: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -raw scsitest.asm cdrom.asm
$(AS) $(AFLAGS) --raw scsitest.asm cdrom.asm

scsitest.ovl: $(SRC_OVL) $(SRC_INC) scsitest.pce
$(AS) $(AFLAGS) --cd --overlay scsitest.asm cdrom.asm
4 changes: 2 additions & 2 deletions examples/asm/elmer/ipl-scd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ include ../Make_ex.inc

SRC = ipl-scd.asm ../font/font8x8-ascii-exos.dat

AFLAGS ?= -raw -m -l 2 -S
AFLAGS ?= --raw -m -l 2 -S

ipl-scd.out: $(SRC)
$(AS) $(AFLAGS) -ipl ipl-scd.asm -o ipl-scd.out
$(AS) $(AFLAGS) --ipl ipl-scd.asm -o ipl-scd.out

../include/ipl-scd.dat: ipl-scd.out
ifeq ($(CP),copy)
Expand Down
4 changes: 2 additions & 2 deletions examples/asm/elmer/ipl-scd/ipl-scd.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ ex_memopen = $00:E0DE, FUNC
; ***************************************************************************
; ***************************************************************************
;
; ipl_scd - Replacement IPL file loader using ISOlink diectory information.
; ipl_scd - Replacement IPL file loader using ISOlink directory information.
;

.org $3090 ; First free memory in IPL.
Expand Down Expand Up @@ -495,7 +495,7 @@ upload_font8x8: ldx #$14 ; Upload solid version to
; ***************************************************************************
; ***************************************************************************
;
; write_string - Upload an 8x8 font with a drop-shadow generated by the CPU.
; write_string - Write a text string to the screen.
;

write_string: sta <_al ; String address.
Expand Down
4 changes: 2 additions & 2 deletions examples/asm/elmer/rom-bare-buftest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ all: buftest.pce

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S
AFLAGS ?= --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc joypad.asm tty.asm vce.asm vdc.asm
SRC_OVL = buftest.asm

buftest.pce: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -raw buftest.asm
$(AS) $(AFLAGS) --raw buftest.asm
4 changes: 2 additions & 2 deletions examples/asm/elmer/rom-bare-mwrtest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ all: mwrtest.pce

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S
AFLAGS ?= --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc joypad.asm tty.asm vce.asm vdc.asm
SRC_OVL = mwrtest.asm

mwrtest.pce: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -raw mwrtest.asm
$(AS) $(AFLAGS) --raw mwrtest.asm
4 changes: 2 additions & 2 deletions examples/asm/elmer/rom-bare-rcrtest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ all: rcrtest.pce

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S
AFLAGS ?= --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc joypad.asm tty.asm vce.asm vdc.asm
SRC_OVL = rcrtest.asm

rcrtest.pce: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -raw rcrtest.asm
$(AS) $(AFLAGS) --raw rcrtest.asm
4 changes: 2 additions & 2 deletions examples/asm/elmer/rom-bare-tiatest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ all: tiatest.pce

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S
AFLAGS ?= --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc joypad.asm tty.asm vce.asm vdc.asm
SRC_OVL = tiatest.asm

tiatest.pce: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -raw tiatest.asm
$(AS) $(AFLAGS) --raw tiatest.asm
4 changes: 2 additions & 2 deletions examples/asm/elmer/rom-core-hello/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ all: hello.pce

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S
AFLAGS ?= --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
SRC_OVL = hello.asm core-config.inc

hello.pce: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -raw hello.asm
$(AS) $(AFLAGS) --raw hello.asm
8 changes: 5 additions & 3 deletions examples/asm/elmer/rom-core-hugerom/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ all: hugerom.pce hugerom.s

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S
AFLAGS ?= --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm common.asm vdc.asm unpack-zx0.asm
SRC_OVL = hugerom.asm core-config.inc

hugerom.pce hugerom.sym: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -sf2 -raw hugerom.asm
$(AS) $(AFLAGS) --sf2 --raw hugerom.asm

hugerom.s: hugerom.s2i hugerom.sym
$(S2I) hugerom.s2i
$(CP) hugerom.sym hugerom.s

# $(S2I) hugerom.s2i ... currently broken, sym2inc needs to understand mesen format
8 changes: 4 additions & 4 deletions examples/asm/elmer/rom-core-okitest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ all: okitest.pce okitest.ovl core-okitest.iso

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S
AFLAGS ?= --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm tty.asm vce.asm vdc.asm adpcm.asm
SRC_OVL = okitest.asm core-config.inc

SRC_ISO = okitest.ovl

okitest.pce: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -raw okitest.asm
$(AS) $(AFLAGS) --raw okitest.asm

okitest.ovl: $(SRC_OVL) $(SRC_INC) okitest.pce
$(AS) $(AFLAGS) -cd -overlay okitest.asm
$(AS) $(AFLAGS) --cd --overlay okitest.asm

core-okitest.iso: $(SRC_ISO)
$(IL) core-okitest.iso -ipl="OKI Test CD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)
$(IL) core-okitest.iso -ipl="OKI Test CD" $(SRC_ISO)
4 changes: 2 additions & 2 deletions examples/asm/elmer/rom-kickc-hello/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ all: hello.pce

include ../Make_ex.inc

AFLAGS ?= -kc -newproc -strip -m -l 2 -S
AFLAGS ?= --kc --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm kickc.asm kickc-final.asm
SRC_OVL = hello.asm core-config.inc

hello.pce: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -raw hello.asm
$(AS) $(AFLAGS) --raw hello.asm
4 changes: 2 additions & 2 deletions examples/asm/elmer/rom-kickc-shmup/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ all: shmup.pce

include ../Make_ex.inc

AFLAGS ?= -kc -newproc -strip -m -l 2 -S
AFLAGS ?= --kc --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm kickc.asm kickc-final.asm
SRC_OVL = shmup.asm core-config.inc

shmup.pce: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -raw shmup.asm
$(AS) $(AFLAGS) --raw shmup.asm
10 changes: 5 additions & 5 deletions examples/asm/elmer/scd-bios-hello-error/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ all: bios-hello-error.iso

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc
SRC_OVL = hello.asm
Expand All @@ -13,12 +13,12 @@ ERR_OVL = error.asm
SRC_ISO = hello.ovl

bios-hello-error.iso: $(SRC_ISO) error.ovl
$(IL) bios-hello-error.iso -boot="../include/ipl-scd.dat" -ipl="SuperCD Error" -asm $(SRC_ISO) -cderr error.ovl
$(IL) bios-hello-error.iso --boot="../include/ipl-scd.dat" --ipl="SuperCD Error" $(SRC_ISO) --cderr error.ovl

hello.ovl: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -scd hello.asm
$(AS) $(AFLAGS) --scd hello.asm

# Note that the error overlay is assembled as "-cd" and NOT "-scd"!
# Note that the error overlay is assembled as "--cd" and NOT "--scd"!

error.ovl: $(ERR_OVL) $(ERR_INC)
$(AS) $(AFLAGS) -cd error.asm
$(AS) $(AFLAGS) --cd error.asm
6 changes: 3 additions & 3 deletions examples/asm/elmer/scd-bios-hello/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ all: bios-hello.iso

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc
SRC_OVL = hello.asm

SRC_ISO = hello.ovl

bios-hello.iso: $(SRC_ISO)
$(IL) bios-hello.iso -boot="../include/ipl-scd.dat" -ipl="Hello SuperCD" -asm $(SRC_ISO)
$(IL) bios-hello.iso --boot="../include/ipl-scd.dat" --ipl="Hello SuperCD" $(SRC_ISO)

hello.ovl: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -scd hello.asm
$(AS) $(AFLAGS) --scd hello.asm
10 changes: 5 additions & 5 deletions examples/asm/elmer/scd-core-1stage-error/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ all: core-1stage-error.iso

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
SRC_OVL = stage1.asm core-config.inc
Expand All @@ -13,12 +13,12 @@ ERR_OVL = error.asm core-config.inc saz_vdc.zx0 saz_vce.zx0
SRC_ISO = stage1.ovl

core-1stage-error.iso: $(SRC_ISO) error.ovl
$(IL) core-1stage-error.iso -boot="../include/ipl-scd.dat" -ipl="1-Stage-cderr CD" -asm $(SRC_ISO) -cderr error.ovl
$(IL) core-1stage-error.iso --ipl="1-Stage-cderr CD" $(SRC_ISO) --cderr error.ovl

stage1.ovl: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -scd stage1.asm
$(AS) $(AFLAGS) --scd stage1.asm

# Note that the error overlay is assembled as "-cd" and NOT "-scd"!
# Note that the error overlay is assembled as "--cd" and NOT "--scd"!

error.ovl: $(ERR_OVL) $(ERR_INC)
$(AS) $(AFLAGS) -cd error.asm
$(AS) $(AFLAGS) --cd error.asm
6 changes: 3 additions & 3 deletions examples/asm/elmer/scd-core-1stage/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ all: core-1stage.iso

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA

SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
SRC_OVL = stage1.asm core-config.inc

SRC_ISO = stage1.ovl

core-1stage.iso: $(SRC_ISO)
$(IL) core-1stage.iso -boot="../include/ipl-scd.dat" -ipl="1-Stage SuperCD" -asm $(SRC_ISO)
$(IL) core-1stage.iso --ipl="1-Stage SuperCD" $(SRC_ISO)

stage1.ovl: $(SRC_OVL) $(SRC_INC)
$(AS) $(AFLAGS) -scd stage1.asm
$(AS) $(AFLAGS) --scd stage1.asm
12 changes: 6 additions & 6 deletions examples/asm/elmer/scd-core-2stage-error/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ all: core-2stage-error.iso

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA

SRC1_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
SRC1_OVL = core-stage1.asm core-config.inc
Expand All @@ -16,18 +16,18 @@ ERR_OVL = error.asm core-config.inc saz_vdc.zx0 saz_vce.zx0
SRC_ISO = core-stage1.bin stage2.ovl

core-2stage-error.iso: $(SRC_ISO) error.ovl
$(IL) core-2stage-error.iso -ipl="2-Stage cderr CD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO) -cderr error.ovl
$(IL) core-2stage-error.iso --ipl="2-Stage cderr CD" $(SRC_ISO) --cderr error.ovl

core-stage1.bin core-stage1.sym: $(SRC1_OVL) $(SRC1_INC)
$(AS) $(AFLAGS) -scd -trim core-stage1.asm
$(AS) --scd --overlay --trim core-stage1.asm

core-stage1.s: core-stage1.s2i core-stage1.sym
$(S2I) core-stage1.s2i

stage2.ovl: $(SRC2_OVL) $(SRC2_INC) core-stage1.s
$(AS) $(AFLAGS) -scd stage2.asm
$(AS) $(AFLAGS) --scd stage2.asm

# Note that the error overlay is assembled as "-cd" and NOT "-scd"!
# Note that the error overlay is assembled as "--cd" and NOT "--scd"!

error.ovl: $(ERR_OVL) $(ERR_INC) core-stage1.s
$(AS) $(AFLAGS) -cd error.asm
$(AS) $(AFLAGS) --cd error.asm
8 changes: 4 additions & 4 deletions examples/asm/elmer/scd-core-2stage/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ all: core-2stage.iso

include ../Make_ex.inc

AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA

SRC1_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
SRC1_OVL = core-stage1.asm core-config.inc
Expand All @@ -13,13 +13,13 @@ SRC2_OVL = stage2.asm core-config.inc
SRC_ISO = core-stage1.bin stage2.ovl

core-2stage.iso: $(SRC_ISO)
$(IL) core-2stage.iso -ipl="2-Stage SuperCD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)
$(IL) core-2stage.iso --ipl="2-Stage SuperCD" $(SRC_ISO)

core-stage1.bin core-stage1.sym: $(SRC1_OVL) $(SRC1_INC)
$(AS) $(AFLAGS) -scd -trim core-stage1.asm
$(AS) --scd --overlay --trim core-stage1.asm

core-stage1.s: core-stage1.s2i core-stage1.sym
$(S2I) core-stage1.s2i

stage2.ovl: $(SRC2_OVL) $(SRC2_INC) core-stage1.s
$(AS) $(AFLAGS) -scd stage2.asm
$(AS) $(AFLAGS) --scd stage2.asm
Loading