* support/regression/Makefile.in,

[fw/sdcc] / support / regression / ports / ucz80 / spec.mk

diff --git a/support/regression/ports/ucz80/spec.mk b/support/regression/ports/ucz80/spec.mk
index 42e8b791611e8652164ce2e83cd9287c8e90d2db..2189e2f740997d326694aa732948d93e7c07f3c2 100644 (file)
--- a/support/regression/ports/ucz80/spec.mk
+++ b/support/regression/ports/ucz80/spec.mk
@@ -1,45 +1,57 @@
-# Port specification for the xxxx port running with uCsim
+# Regression test specification for the z80 target running with uCsim
 #
 
 # path to uCsim
-# path to uCsim
-SZ80A = $(SDCC_DIR)/sim/ucsim/sz80.src/sz80
-SZ80B = $(SDCC_DIR)/bin/sz80
+ifdef SDCC_BIN_PATH
+  UCZ80 = $(SDCC_BIN_PATH)/sz80
+
+  AS_Z80 = $(SDCC_BIN_PATH)/as-z80
+else
+  SZ80A = $(top_builddir)/sim/ucsim/z80.src/sz80
+  SZ80B = $(top_builddir)/bin/sz80
+
+  UCZ80 = $(shell if [ -f $(SZ80A) ]; then echo $(SZ80A); else echo $(SZ80B); fi)
+
+  AS_Z80 = $(top_builddir)/bin/as-z80
 
-UCZ80 = $(shell if [ -f $(SZ80A) ]; then echo $(SZ80A); else echo $(SZ80B); fi)
+  SDCCFLAGS += --nostdinc -I$(top_srcdir)
+  LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/z80
+endif
 
 SDCCFLAGS +=-mz80 --less-pedantic --profile -DREENTRANT=
 #SDCCFLAGS +=--less-pedantic -DREENTRANT=reentrant
+LINKFLAGS += z80.lib
 
 #OBJEXT = .o
 EXEEXT = .ihx
 
-EXTRAS = $(PORTS_DIR)/$(PORT)/testfwk$(OBJEXT) $(PORTS_DIR)/$(PORT)/support$(OBJEXT)
+EXTRAS = $(PORT_CASES_DIR)/testfwk$(OBJEXT) $(PORT_CASES_DIR)/support$(OBJEXT)
 
 # Rule to link into .ihx
-#%$(EXEEXT): %$(OBJEXT) $(EXTRAS)
+%.ihx: %.c $(EXTRAS)
+       $(SDCC) $(SDCCFLAGS) $(LINKFLAGS) $(EXTRAS) $< -o $@
 
-%$(EXEEXT): %.c $(EXTRAS)
-       $(SDCC) $(SDCCFLAGS) $< $(EXTRAS) -o $@
-
-%$(OBJEXT): %.asm
-       $(SDCC_DIR)/bin/as-z80 -plosgff $@ $<
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.asm
+       $(AS_Z80) -plosgff $@ $<
 
 %$(OBJEXT): %.c
        $(SDCC) $(SDCCFLAGS) -c $< -o $@
 
-$(PORTS_DIR)/$(PORT)/%$(OBJEXT): fwk/lib/%.c
+$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.c
+       $(SDCC) $(SDCCFLAGS) -c $< -o $@
+
+$(PORT_CASES_DIR)/%$(OBJEXT): fwk/lib/%.c
        $(SDCC) $(SDCCFLAGS) -c $< -o $@
 
 # run simulator with 10 seconds timeout
-%.out: %$(EXEEXT) fwk/lib/timeout
-       mkdir -p `dirname $@`
-       -fwk/lib/timeout 10 $(UCZ80) -t32 $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
+%.out: %$(EXEEXT) $(CASES_DIR)/timeout
+       mkdir -p $(dir $@)
+       -$(CASES_DIR)/timeout 10 $(UCZ80) $< < $(PORTS_DIR)/$(PORT)/uCsim.cmd > $@ \
          || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(EXEEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@
+       python $(srcdir)/get_ticks.py < $@ >> $@
        -grep -n FAIL $@ /dev/null || true
 
-fwk/lib/timeout: fwk/lib/timeout.c
+$(CASES_DIR)/timeout: fwk/lib/timeout.c
+       $(CC) $(CFLAGS) $< -o $@
 
 _clean:
-       rm -f ports/$(PORT)/testfwk.asm ports/$(PORT)/*.lst ports/$(PORT)/*.o ports/$(PORT)/*.sym
-