From 62340b1075f4347fb9e4aa007635b561d0f1ce45 Mon Sep 17 00:00:00 2001 From: borutr Date: Sun, 28 Oct 2007 14:45:55 +0000 Subject: [PATCH] * support/regression/Makefile.in, support/regression/ports/mcs51-large/spec.mk, support/regression/ports/mcs51-xstack-auto/spec.mk, support/regression/ports/mcs51-stack-auto/spec.mk, support/regression/ports/mcs51-medium/spec.mk, support/regression/ports/mcs51-common/spec.mk, support/regression/ports/mcs51-common/*, support/regression/ports/mcs51-small/*: mcs51 renamed to mcs51-common, created mcs51-small git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4945 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 12 ++++++++++++ support/regression/Makefile.in | 6 +++--- .../ports/{mcs51 => mcs51-common}/T2_isr.c | 0 .../regression/ports/{mcs51 => mcs51-common}/fwk.lib | 0 .../regression/ports/{mcs51 => mcs51-common}/spec.mk | 11 ++++------- .../ports/{mcs51 => mcs51-common}/support.c | 0 .../ports/{mcs51 => mcs51-common}/uCsim.cmd | 0 support/regression/ports/mcs51-large/spec.mk | 8 ++------ support/regression/ports/mcs51-medium/spec.mk | 8 ++------ support/regression/ports/mcs51-small/spec.mk | 9 +++++++++ support/regression/ports/mcs51-stack-auto/spec.mk | 8 ++------ support/regression/ports/mcs51-xstack-auto/spec.mk | 8 ++------ 12 files changed, 36 insertions(+), 34 deletions(-) rename support/regression/ports/{mcs51 => mcs51-common}/T2_isr.c (100%) rename support/regression/ports/{mcs51 => mcs51-common}/fwk.lib (100%) rename support/regression/ports/{mcs51 => mcs51-common}/spec.mk (84%) rename support/regression/ports/{mcs51 => mcs51-common}/support.c (100%) rename support/regression/ports/{mcs51 => mcs51-common}/uCsim.cmd (100%) create mode 100644 support/regression/ports/mcs51-small/spec.mk diff --git a/ChangeLog b/ChangeLog index 70b5d09a..9076edc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-10-28 Borut Razem + + * support/regression/Makefile.in, + support/regression/ports/mcs51-large/spec.mk, + support/regression/ports/mcs51-xstack-auto/spec.mk, + support/regression/ports/mcs51-stack-auto/spec.mk, + support/regression/ports/mcs51-medium/spec.mk, + support/regression/ports/mcs51-common/spec.mk, + support/regression/ports/mcs51-common/*, + support/regression/ports/mcs51-small/*: + mcs51 renamed to mcs51-common, created mcs51-small + 2007-10-26 Maarten Brock * src/mcs51/peeph.def: moved rules 257.x to 253.x and re-enabled 253.b, diff --git a/support/regression/Makefile.in b/support/regression/Makefile.in index 4bedab0c..08a1c0ee 100644 --- a/support/regression/Makefile.in +++ b/support/regression/Makefile.in @@ -69,10 +69,10 @@ GENERATE_CASES = $(srcdir)/generate-cases.py # Each directory under ports/ is used as a port name. Each port is tested. # Each port must have a spec.mk which describes how to build the object # files and how to run the emulator. -ALL_PORTS = $(filter-out .svn xa51 z80 gbz80 pic16 pic14,$(notdir $(wildcard $(PORTS_DIR)/*))) +ALL_PORTS = $(filter-out .svn xa51 z80 gbz80 pic16 pic14 mcs51-common,$(notdir $(wildcard $(PORTS_DIR)/*))) # These ports will be cleaned with 'make clean' -CLEAN_PORTS = $(filter-out .svn,$(notdir $(wildcard $(PORTS_DIR)/*))) +CLEAN_PORTS = $(filter-out .svn mcs51-common,$(notdir $(wildcard $(PORTS_DIR)/*))) MAKE_LIBRARY = @@ -94,7 +94,7 @@ test-gbz80: test-mcs51: test-mcs51-small test-mcs51-medium test-mcs51-large test-mcs51-stack-auto test-mcs51-xstack-auto test-mcs51-small: - $(MAKE) test-port PORT=mcs51 + $(MAKE) test-port PORT=mcs51-small test-mcs51-medium: $(MAKE) test-port PORT=mcs51-medium diff --git a/support/regression/ports/mcs51/T2_isr.c b/support/regression/ports/mcs51-common/T2_isr.c similarity index 100% rename from support/regression/ports/mcs51/T2_isr.c rename to support/regression/ports/mcs51-common/T2_isr.c diff --git a/support/regression/ports/mcs51/fwk.lib b/support/regression/ports/mcs51-common/fwk.lib similarity index 100% rename from support/regression/ports/mcs51/fwk.lib rename to support/regression/ports/mcs51-common/fwk.lib diff --git a/support/regression/ports/mcs51/spec.mk b/support/regression/ports/mcs51-common/spec.mk similarity index 84% rename from support/regression/ports/mcs51/spec.mk rename to support/regression/ports/mcs51-common/spec.mk index 4d3ebf3c..14aeffd3 100644 --- a/support/regression/ports/mcs51/spec.mk +++ b/support/regression/ports/mcs51-common/spec.mk @@ -1,6 +1,4 @@ -# Port specification for the mcs51 port running with uCsim -# -# model small +# Common specification for the mcs51 ports running with uCsim ifndef DEV_NULL DEV_NULL = /dev/null @@ -15,7 +13,6 @@ S51 = $(shell if [ -f $(S51A) ]; then echo $(S51A); else echo $(S51B); fi) SDCCFLAGS +=--nostdinc --less-pedantic -DREENTRANT=reentrant -I$(INC_DIR)/mcs51 -I$(top_srcdir) LINKFLAGS = --nostdlib LINKFLAGS += mcs51.lib libsdcc.lib liblong.lib libint.lib libfloat.lib -LIBDIR = $(top_builddir)/device/lib/build/small OBJEXT = .rel EXEEXT = .ihx @@ -30,19 +27,19 @@ FWKLIB = $(PORT_CASES_DIR)/T2_isr$(OBJEXT) %$(OBJEXT): %.c $(SDCC) $(SDCCFLAGS) -c $< -o $@ -$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/$(PORT)/%.c +$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/mcs51-common/%.c $(SDCC) $(SDCCFLAGS) -c $< -o $@ $(PORT_CASES_DIR)/%$(OBJEXT): fwk/lib/%.c $(SDCC) $(SDCCFLAGS) -c $< -o $@ $(PORT_CASES_DIR)/fwk.lib: - cp $(PORTS_DIR)/mcs51/fwk.lib $@ + cp $(PORTS_DIR)/mcs51-common/fwk.lib $@ # run simulator with 30 seconds timeout %.out: %$(EXEEXT) gen/timeout mkdir -p $(dir $@) - -gen/timeout 30 "$(S51)" -t32 -S in=$(DEV_NULL),out=$@ $< < $(PORTS_DIR)/mcs51/uCsim.cmd > $(@:.out=.sim) \ + -gen/timeout 30 "$(S51)" -t32 -S in=$(DEV_NULL),out=$@ $< < $(PORTS_DIR)/mcs51-common/uCsim.cmd > $(@:.out=.sim) \ || echo -e --- FAIL: \"timeout, simulation killed\" in $(<:$(EXEEXT)=.c)"\n"--- Summary: 1/1/1: timeout >> $@ python $(srcdir)/get_ticks.py < $(@:.out=.sim) >> $@ -grep -n FAIL $@ /dev/null || true diff --git a/support/regression/ports/mcs51/support.c b/support/regression/ports/mcs51-common/support.c similarity index 100% rename from support/regression/ports/mcs51/support.c rename to support/regression/ports/mcs51-common/support.c diff --git a/support/regression/ports/mcs51/uCsim.cmd b/support/regression/ports/mcs51-common/uCsim.cmd similarity index 100% rename from support/regression/ports/mcs51/uCsim.cmd rename to support/regression/ports/mcs51-common/uCsim.cmd diff --git a/support/regression/ports/mcs51-large/spec.mk b/support/regression/ports/mcs51-large/spec.mk index e7353466..e919a49e 100644 --- a/support/regression/ports/mcs51-large/spec.mk +++ b/support/regression/ports/mcs51-large/spec.mk @@ -1,13 +1,9 @@ -# Port specification for the mcs51 port running with uCsim +# Port specification for the mcs51-large port running with uCsim # # model large SDCCFLAGS +=--model-large -include $(PORTS_DIR)/mcs51/spec.mk - -# use C sources from mcs51 -$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/mcs51/%.c - $(SDCC) $(SDCCFLAGS) -c $< -o $@ +include $(PORTS_DIR)/mcs51-common/spec.mk LIBDIR = $(top_builddir)/device/lib/build/large diff --git a/support/regression/ports/mcs51-medium/spec.mk b/support/regression/ports/mcs51-medium/spec.mk index 5fdd1593..a6014ab7 100644 --- a/support/regression/ports/mcs51-medium/spec.mk +++ b/support/regression/ports/mcs51-medium/spec.mk @@ -1,13 +1,9 @@ -# Port specification for the mcs51 port running with uCsim +# Port specification for the mcs51-medium port running with uCsim # # model medium SDCCFLAGS +=--model-medium -include $(PORTS_DIR)/mcs51/spec.mk - -# use C sources from mcs51 -$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/mcs51/%.c - $(SDCC) $(SDCCFLAGS) -c $< -o $@ +include $(PORTS_DIR)/mcs51-common/spec.mk LIBDIR = $(top_builddir)/device/lib/build/medium diff --git a/support/regression/ports/mcs51-small/spec.mk b/support/regression/ports/mcs51-small/spec.mk new file mode 100644 index 00000000..58a0616d --- /dev/null +++ b/support/regression/ports/mcs51-small/spec.mk @@ -0,0 +1,9 @@ +# Port specification for the mcs51 port running with uCsim +# +# model small + +SDCCFLAGS +=--model-small + +include $(PORTS_DIR)/mcs51-common/spec.mk + +LIBDIR = $(top_builddir)/device/lib/build/small diff --git a/support/regression/ports/mcs51-stack-auto/spec.mk b/support/regression/ports/mcs51-stack-auto/spec.mk index 9025a9b4..4727dccd 100644 --- a/support/regression/ports/mcs51-stack-auto/spec.mk +++ b/support/regression/ports/mcs51-stack-auto/spec.mk @@ -1,13 +1,9 @@ -# Port specification for the mcs51 port running with uCsim +# Port specification for the mcs51-stack-auto port running with uCsim # # model small stack-auto SDCCFLAGS +=--stack-auto -include $(PORTS_DIR)/mcs51/spec.mk - -# use C sources from mcs51 -$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/mcs51/%.c - $(SDCC) $(SDCCFLAGS) -c $< -o $@ +include $(PORTS_DIR)/mcs51-common/spec.mk LIBDIR = $(top_builddir)/device/lib/build/small-stack-auto diff --git a/support/regression/ports/mcs51-xstack-auto/spec.mk b/support/regression/ports/mcs51-xstack-auto/spec.mk index 16fcc2df..ca07c46a 100644 --- a/support/regression/ports/mcs51-xstack-auto/spec.mk +++ b/support/regression/ports/mcs51-xstack-auto/spec.mk @@ -1,8 +1,8 @@ -# Port specification for the mcs51 port running with uCsim +# Port specification for the mcs51-xstack-auto port running with uCsim # # model small xstack-auto -include $(PORTS_DIR)/mcs51/spec.mk +include $(PORTS_DIR)/mcs51-common/spec.mk LIBSRCDIR = $(top_srcdir)/device/lib LIBBUILDDIR = $(top_builddir)/device/lib @@ -11,10 +11,6 @@ LIBDIR = $(PORT_CASES_DIR)/lib LIBSDCCFLAGS+= --stack-auto --xstack --std-c99 SDCCFLAGS += --stack-auto --xstack --std-sdcc99 -# use C sources from mcs51 -$(PORT_CASES_DIR)/%$(OBJEXT): $(PORTS_DIR)/mcs51/%.c - $(SDCC) $(SDCCFLAGS) -c $< -o $@ - SOURCES = _atoi.c _atol.c _autobaud.c _bp.c _schar2fs.c \ _decdptr.c _divsint.c _divslong.c _divuint.c \ _divulong.c _fs2schar.c _fs2sint.c _fs2slong.c \ -- 2.30.2