X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=support%2Fregression%2Fports%2Fz80%2Fspec.mk;h=133394950bd57910eca111cb5f438b195bc96497;hb=f239a9f256f022ade8216daba928e817f2d5f528;hp=695a2b29084ffc1d12cf3e32a1ce65f68fe80685;hpb=9ad61095075b803a72da117739ff5030c91bcd06;p=fw%2Fsdcc

diff --git a/support/regression/ports/z80/spec.mk b/support/regression/ports/z80/spec.mk
index 695a2b29..13339495 100644
--- a/support/regression/ports/z80/spec.mk
+++ b/support/regression/ports/z80/spec.mk
@@ -1,27 +1,22 @@
 # Port specification for the z80 port running ontop of the Java based
 # 'ConsoleZ80' emulator.
 
-# PENDING: Path to gbdk-lib for stdarg
-GBDK_LIB = ../../../gbdk-lib
-SDCCFLAGS += -I$(GBDK_LIB)/include
+RRZ80 = $(SDCC_EXTRA_DIR)/emu/rrz80/rrz80
+
+SDCCFLAGS += --lesspedantic --profile
 
 EXEEXT = .bin
 
 # Needs parts of gbdk-lib, namely the internal mul/div/mod functions.
-EXTRAS = fwk/lib/testfwk$(OBJEXT) ports/$(PORT)/support$(OBJEXT) \
-	$(GBDK_LIB)/libc/asm/z80/mul$(OBJEXT) \
-	$(GBDK_LIB)/libc/asm/z80/div$(OBJEXT)
+EXTRAS = fwk/lib/testfwk$(OBJEXT) ports/$(PORT)/support$(OBJEXT)
 
 # Rule to generate a Emulator .bin file from the .ihx linker output.
 %$(EXEEXT): %.ihx
 	../makebin/makebin -s 32768 < $< > $@  # Must be 32768 due to a bug in ConsoleZ80
 
 # Rule to link into .ihx
-%.ihx: %$(OBJEXT) $(EXTRAS)
-	../../bin/link-z80 -n -- -b_CODE=0x200 -b_DATA=0x8000 -i $@ $< $(EXTRAS)
-
-%$(OBJEXT): %.c fwk/include/*.h
-	$(SDCC) $(SDCCFLAGS) -c $<
+%.ihx: %.c $(EXTRAS)
+	$(SDCC) $(SDCCFLAGS) $< $(EXTRAS)
 
 %$(OBJEXT): %.asm
 	../../bin/as-z80 -plosgff $@ $<
@@ -32,5 +27,6 @@ EXTRAS = fwk/lib/testfwk$(OBJEXT) ports/$(PORT)/support$(OBJEXT) \
 # PENDING: Path to sdcc-extra
 %.out: %$(EXEEXT)
 	mkdir -p `dirname $@`
-	java -cp ../../../sdcc-extra/emu/rose ConsoleZ80 $< > $@
-	if grep -q FAIL $@; then echo FAILURES in $@; fi
+	$(RRZ80) --maxruntime=3 --mapfile=$(<:.bin=.sym) $< > $@
+	-grep -n FAIL $@ /dev/null || true
+