diff --git a/benchmarks/source/superh/port/devexcp.c b/benchmarks/source/port/devexcp.c similarity index 100% rename from benchmarks/source/superh/port/devexcp.c rename to benchmarks/source/port/devexcp.c diff --git a/benchmarks/source/superh/port/devexcp.h b/benchmarks/source/port/devexcp.h similarity index 100% rename from benchmarks/source/superh/port/devexcp.h rename to benchmarks/source/port/devexcp.h diff --git a/benchmarks/source/superh/port/devloc.c b/benchmarks/source/port/devloc.c similarity index 100% rename from benchmarks/source/superh/port/devloc.c rename to benchmarks/source/port/devloc.c diff --git a/benchmarks/source/superh/port/devloc.h b/benchmarks/source/port/devloc.h similarity index 100% rename from benchmarks/source/superh/port/devloc.h rename to benchmarks/source/port/devloc.h diff --git a/benchmarks/source/superh/port/devlog.c b/benchmarks/source/port/devlog.c similarity index 100% rename from benchmarks/source/superh/port/devlog.c rename to benchmarks/source/port/devlog.c diff --git a/benchmarks/source/superh/port/devlog.h b/benchmarks/source/port/devlog.h similarity index 100% rename from benchmarks/source/superh/port/devlog.h rename to benchmarks/source/port/devlog.h diff --git a/benchmarks/source/superh/port/devmac.c b/benchmarks/source/port/devmac.c similarity index 100% rename from benchmarks/source/superh/port/devmac.c rename to benchmarks/source/port/devmac.c diff --git a/benchmarks/source/superh/port/devmac.h b/benchmarks/source/port/devmac.h similarity index 100% rename from benchmarks/source/superh/port/devmac.h rename to benchmarks/source/port/devmac.h diff --git a/benchmarks/source/superh/port/devnet.c b/benchmarks/source/port/devnet.c similarity index 100% rename from benchmarks/source/superh/port/devnet.c rename to benchmarks/source/port/devnet.c diff --git a/benchmarks/source/superh/port/devnet.h b/benchmarks/source/port/devnet.h similarity index 100% rename from benchmarks/source/superh/port/devnet.h rename to benchmarks/source/port/devnet.h diff --git a/benchmarks/source/superh/port/devrand.c b/benchmarks/source/port/devrand.c similarity index 100% rename from benchmarks/source/superh/port/devrand.c rename to benchmarks/source/port/devrand.c diff --git a/benchmarks/source/superh/port/devrand.h b/benchmarks/source/port/devrand.h similarity index 100% rename from benchmarks/source/superh/port/devrand.h rename to benchmarks/source/port/devrand.h diff --git a/benchmarks/source/superh/port/devrtc.c b/benchmarks/source/port/devrtc.c similarity index 100% rename from benchmarks/source/superh/port/devrtc.c rename to benchmarks/source/port/devrtc.c diff --git a/benchmarks/source/superh/port/devrtc.h b/benchmarks/source/port/devrtc.h similarity index 100% rename from benchmarks/source/superh/port/devrtc.h rename to benchmarks/source/port/devrtc.h diff --git a/benchmarks/source/superh/port/devsensor.c b/benchmarks/source/port/devsensor.c similarity index 100% rename from benchmarks/source/superh/port/devsensor.c rename to benchmarks/source/port/devsensor.c diff --git a/benchmarks/source/superh/port/devsensor.h b/benchmarks/source/port/devsensor.h similarity index 100% rename from benchmarks/source/superh/port/devsensor.h rename to benchmarks/source/port/devsensor.h diff --git a/benchmarks/source/superh/port/logmarkers.h b/benchmarks/source/port/logmarkers.h similarity index 100% rename from benchmarks/source/superh/port/logmarkers.h rename to benchmarks/source/port/logmarkers.h diff --git a/benchmarks/source/superh/port/misc.c b/benchmarks/source/port/misc.c similarity index 85% rename from benchmarks/source/superh/port/misc.c rename to benchmarks/source/port/misc.c index 55c5090c..66bee4be 100644 --- a/benchmarks/source/superh/port/misc.c +++ b/benchmarks/source/port/misc.c @@ -40,17 +40,6 @@ xudelay(ulong usecs) } } -void -xusleep(ulong usecs) -{ - ulong time = devrtc_getusecs(); - - while ((devrtc_getusecs() - time) < usecs) - { - sleep(); - } -} - int pow10(int y) { diff --git a/benchmarks/source/superh/port/misc.h b/benchmarks/source/port/misc.h similarity index 70% rename from benchmarks/source/superh/port/misc.h rename to benchmarks/source/port/misc.h index 5171c048..23fcdd96 100644 --- a/benchmarks/source/superh/port/misc.h +++ b/benchmarks/source/port/misc.h @@ -3,5 +3,4 @@ void xudelay(ulong); int pow10(int y); -extern void sleep(void); -void xusleep(ulong); + diff --git a/benchmarks/source/port/superHspecific.c b/benchmarks/source/port/superHspecific.c new file mode 100644 index 00000000..7e984e7a --- /dev/null +++ b/benchmarks/source/port/superHspecific.c @@ -0,0 +1,15 @@ +#include "e-types.h" +#include "sh7708.h" +#include "devrtc.h" +#include "misc.h" + +void +xusleep(ulong usecs) +{ + ulong time = devrtc_getusecs(); + + while ((devrtc_getusecs() - time) < usecs) + { + sleep(); + } +} diff --git a/benchmarks/source/port/superHspecific.h b/benchmarks/source/port/superHspecific.h new file mode 100644 index 00000000..bc9992f3 --- /dev/null +++ b/benchmarks/source/port/superHspecific.h @@ -0,0 +1,2 @@ +extern void sleep(void); +void xusleep(ulong); diff --git a/benchmarks/source/superh/ConvolutionFourierTransform/Makefile b/benchmarks/source/superh/ConvolutionFourierTransform/Makefile index cf90d77c..1294ad86 100644 --- a/benchmarks/source/superh/ConvolutionFourierTransform/Makefile +++ b/benchmarks/source/superh/ConvolutionFourierTransform/Makefile @@ -6,7 +6,7 @@ TARGET-ARCH = sh-elf PROGRAM = virtualSensorExample -PORT = ../port +PORT = ../../port LIBOS = mOS TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I../port/ -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/benchmarks/include -I$(TREEROOT)/sys/libOS/port diff --git a/benchmarks/source/superh/ConvolutionFourierTransform/virtualSensorExample.c b/benchmarks/source/superh/ConvolutionFourierTransform/virtualSensorExample.c index fc8c1935..f7562502 100644 --- a/benchmarks/source/superh/ConvolutionFourierTransform/virtualSensorExample.c +++ b/benchmarks/source/superh/ConvolutionFourierTransform/virtualSensorExample.c @@ -8,12 +8,12 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../port/devrtc.h" +#include "../../port/devexcp.h" +#include "../../port/devlog.h" +#include "../../port/devloc.h" +#include "../../port/devsensor.h" +#include "../../port/misc.h" #include "print.h" #include #include diff --git a/benchmarks/source/superh/FourierTransform/Makefile b/benchmarks/source/superh/FourierTransform/Makefile index cf90d77c..1294ad86 100644 --- a/benchmarks/source/superh/FourierTransform/Makefile +++ b/benchmarks/source/superh/FourierTransform/Makefile @@ -6,7 +6,7 @@ TARGET-ARCH = sh-elf PROGRAM = virtualSensorExample -PORT = ../port +PORT = ../../port LIBOS = mOS TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I../port/ -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/benchmarks/include -I$(TREEROOT)/sys/libOS/port diff --git a/benchmarks/source/superh/FourierTransform/virtualSensorExample.c b/benchmarks/source/superh/FourierTransform/virtualSensorExample.c index 6916035a..f7c68092 100644 --- a/benchmarks/source/superh/FourierTransform/virtualSensorExample.c +++ b/benchmarks/source/superh/FourierTransform/virtualSensorExample.c @@ -8,12 +8,12 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../port/devrtc.h" +#include "../../port/devexcp.h" +#include "../../port/devlog.h" +#include "../../port/devloc.h" +#include "../../port/devsensor.h" +#include "../../port/misc.h" #include "print.h" #include #include diff --git a/benchmarks/source/superh/Schlieren/Makefile b/benchmarks/source/superh/Schlieren/Makefile index 9b59cb9f..e9afcc0d 100644 --- a/benchmarks/source/superh/Schlieren/Makefile +++ b/benchmarks/source/superh/Schlieren/Makefile @@ -6,7 +6,7 @@ TARGET-ARCH = sh-elf PROGRAM = virtualSensorExample -PORT = ../port +PORT = ../../port LIBOS = mOS TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I../port/ -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/benchmarks/include -I$(TREEROOT)/sys/libOS/port diff --git a/benchmarks/source/superh/Schlieren/virtualSensorExample.c b/benchmarks/source/superh/Schlieren/virtualSensorExample.c index 00ff9fa3..d049c944 100644 --- a/benchmarks/source/superh/Schlieren/virtualSensorExample.c +++ b/benchmarks/source/superh/Schlieren/virtualSensorExample.c @@ -8,12 +8,12 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../port/devrtc.h" +#include "../../port/devexcp.h" +#include "../../port/devlog.h" +#include "../../port/devloc.h" +#include "../../port/devsensor.h" +#include "../../port/misc.h" #include "print.h" float diff --git a/benchmarks/source/superh/bubblesort/Makefile b/benchmarks/source/superh/bubblesort/Makefile index 8d1f35dc..6ead3255 100755 --- a/benchmarks/source/superh/bubblesort/Makefile +++ b/benchmarks/source/superh/bubblesort/Makefile @@ -7,7 +7,7 @@ TARGET-ARCH = sh-elf PROGRAM = bsort LIBOS = eOS -PORT = ../port +PORT = ../../port LIBOS = eOS TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I../port/ -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/benchmarks/include -I$(TREEROOT)/sys/libOS/port @@ -36,11 +36,11 @@ $(PROGRAM).sr:$(PROGRAM) $(PROGRAM).o: $(PROGRAM).c $(PROGRAM)-input.h Makefile $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PROGRAM).c -misc.o: ../port/misc.c Makefile - $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c ../port/misc.c +misc.o: ../../port/misc.c Makefile + $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c ../../port/misc.c -devrtc.o: ../port/devrtc.c Makefile - $(CC) $(CFLAGS) $(WFLAGS) $(INCLUDES) -c ../port/devrtc.c +devrtc.o: ../../port/devrtc.c Makefile + $(CC) $(CFLAGS) $(WFLAGS) $(INCLUDES) -c ../../port/devrtc.c init.o: init.S $(CPP) init.S > init.i; $(AS) init.i -o $@ diff --git a/benchmarks/source/superh/fftw-3.3alpha1/tests/Makefile b/benchmarks/source/superh/fftw-3.3alpha1/tests/Makefile index 72597617..af66836a 100644 --- a/benchmarks/source/superh/fftw-3.3alpha1/tests/Makefile +++ b/benchmarks/source/superh/fftw-3.3alpha1/tests/Makefile @@ -13,7 +13,7 @@ INCLUDEDIR = $(TREEROOT)/sys/include INCLUDES = -I$(INCLUDEDIR) -I. -I../ -I../api -I../dft -I../rdft -I../libbench2 -I../kernel -I../../port -I$(TREEROOT)/sys/libOS/port -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/sim CFLAGS = -nostdlib -fno-builtin $(TARGET-ARCH-FLAGS) -Wall LDFLAGS = -Ttext $(LOADADDR) -TsuperH.ld -L$(TREEROOT)/tools/tools-lib/superH -L$(TREEROOT)/sys/libOS/eOS -L$(TREEROOT)/benchmarks/source/libsfpthread -L../ -Map $(PROGRAM).map -PORT = ../../port +PORT = ../../../port OPTFLAGS = -gstabs3 -O0 LOADADDR = 0x08004000 diff --git a/benchmarks/source/superh/findTheBugExample/Makefile b/benchmarks/source/superh/findTheBugExample/Makefile index 978153b6..df6c921f 100755 --- a/benchmarks/source/superh/findTheBugExample/Makefile +++ b/benchmarks/source/superh/findTheBugExample/Makefile @@ -8,7 +8,7 @@ TARGET-ARCH = sh-elf PROGRAM = findTheBugExample LIBOS = mOS -PORT = ../port +PORT = ../../port SIMDIR = $(TREEROOT)/sim TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I$(MACPATH) -I$(PORT) -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(SIMDIR) -I$(TREEROOT)/sys/libOS/port diff --git a/benchmarks/source/superh/interruptExample/Makefile b/benchmarks/source/superh/interruptExample/Makefile index cb8c37cf..1bffaa3e 100755 --- a/benchmarks/source/superh/interruptExample/Makefile +++ b/benchmarks/source/superh/interruptExample/Makefile @@ -8,7 +8,7 @@ TARGET-ARCH = sh-elf PROGRAM = interruptExample LIBOS = eOS -PORT = ../port +PORT = ../../port SIMDIR = $(TREEROOT)/sim TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I$(MACPATH) -I$(PORT) -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(SIMDIR) -I$(TREEROOT)/sys/libOS/port diff --git a/benchmarks/source/superh/lowPassFilter/Makefile b/benchmarks/source/superh/lowPassFilter/Makefile index cf90d77c..1294ad86 100644 --- a/benchmarks/source/superh/lowPassFilter/Makefile +++ b/benchmarks/source/superh/lowPassFilter/Makefile @@ -6,7 +6,7 @@ TARGET-ARCH = sh-elf PROGRAM = virtualSensorExample -PORT = ../port +PORT = ../../port LIBOS = mOS TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I../port/ -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/benchmarks/include -I$(TREEROOT)/sys/libOS/port diff --git a/benchmarks/source/superh/lowPassFilter/virtualSensorExample.c b/benchmarks/source/superh/lowPassFilter/virtualSensorExample.c index f35b8f11..231fddac 100644 --- a/benchmarks/source/superh/lowPassFilter/virtualSensorExample.c +++ b/benchmarks/source/superh/lowPassFilter/virtualSensorExample.c @@ -8,12 +8,12 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../port/devrtc.h" +#include "../../port/devexcp.h" +#include "../../port/devlog.h" +#include "../../port/devloc.h" +#include "../../port/devsensor.h" +#include "../../port/misc.h" #include "print.h" /* diff --git a/benchmarks/source/superh/pedometerExample/Makefile b/benchmarks/source/superh/pedometerExample/Makefile index cf90d77c..1294ad86 100644 --- a/benchmarks/source/superh/pedometerExample/Makefile +++ b/benchmarks/source/superh/pedometerExample/Makefile @@ -6,7 +6,7 @@ TARGET-ARCH = sh-elf PROGRAM = virtualSensorExample -PORT = ../port +PORT = ../../port LIBOS = mOS TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I../port/ -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/benchmarks/include -I$(TREEROOT)/sys/libOS/port diff --git a/benchmarks/source/superh/pedometerExample/virtualSensorExample.c b/benchmarks/source/superh/pedometerExample/virtualSensorExample.c index 32e7dd3b..87d6da0a 100644 --- a/benchmarks/source/superh/pedometerExample/virtualSensorExample.c +++ b/benchmarks/source/superh/pedometerExample/virtualSensorExample.c @@ -12,12 +12,12 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../port/devrtc.h" +#include "../../port/devexcp.h" +#include "../../port/devlog.h" +#include "../../port/devloc.h" +#include "../../port/devsensor.h" +#include "../../port/misc.h" #include "print.h" enum samples {numberOfSamples = 400}; diff --git a/benchmarks/source/superh/sbench/DAM+S-MAC+EAR/Makefile b/benchmarks/source/superh/sbench/DAM+S-MAC+EAR/Makefile index 37979ec8..e62e01b1 100755 --- a/benchmarks/source/superh/sbench/DAM+S-MAC+EAR/Makefile +++ b/benchmarks/source/superh/sbench/DAM+S-MAC+EAR/Makefile @@ -14,7 +14,7 @@ MACPATH = ../S-MAC LIBOS = eOS -PORT = ../../port +PORT = ../../../port LIBOS = eOS SIMDIR = $(TREEROOT)/sim TOOLSLIB = $(TREEROOT)/tools/tools-lib @@ -36,6 +36,7 @@ NODEOBJS =\ devloc.o\ devnet.o\ devmac.o\ + superHspecific.o\ $(MAC).o\ $(ROUTE).o\ $(PROGRAM).o\ @@ -50,6 +51,7 @@ SINKOBJS =\ devloc.o\ devnet.o\ devmac.o\ + superHspecific.o\ $(MAC).o\ $(ROUTE).o\ $(SINK).o\ @@ -111,6 +113,9 @@ devloc.o: $(PORT)/devloc.c Makefile misc.o: $(PORT)/misc.c Makefile $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/misc.c +superHspecific.o: $(PORT)/superHspecific.c Makefile + $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/superHspecific.c + init.o: init.S $(CPP) init.S > init.i; $(AS) init.i -o $@ diff --git a/benchmarks/source/superh/sbench/DAM+S-MAC+EAR/sink.c b/benchmarks/source/superh/sbench/DAM+S-MAC+EAR/sink.c index 5ca38509..aaa4dc24 100644 --- a/benchmarks/source/superh/sbench/DAM+S-MAC+EAR/sink.c +++ b/benchmarks/source/superh/sbench/DAM+S-MAC+EAR/sink.c @@ -11,15 +11,16 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devmac.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devrand.h" -#include "devsensor.h" -#include "misc.h" +#include "../../../port/devnet.h" +#include "../../../port/devmac.h" +#include "../../../port/devrtc.h" +#include "../../../port/devexcp.h" +#include "../../../port/devlog.h" +#include "../../../port/devloc.h" +#include "../../../port/devrand.h" +#include "../../../port/devsensor.h" +#include "../../../port/misc.h" +#include "../../../port/superHspecific.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" diff --git a/benchmarks/source/superh/sbench/DAM+S-MAC/Makefile b/benchmarks/source/superh/sbench/DAM+S-MAC/Makefile index 599ba315..f07acc2e 100755 --- a/benchmarks/source/superh/sbench/DAM+S-MAC/Makefile +++ b/benchmarks/source/superh/sbench/DAM+S-MAC/Makefile @@ -9,7 +9,7 @@ PROGRAM = damv2 MAC = s-mac MACPATH = ../S-MAC -PORT = ../../port +PORT = ../../../port LIBOS = eOS SIMDIR = $(TREEROOT)/sim TOOLSLIB = $(TREEROOT)/tools/tools-lib @@ -28,6 +28,7 @@ OBJS =\ devsensor.o\ devloc.o\ devmac.o\ + superHspecific.o\ $(MAC).o\ $(PROGRAM).o\ @@ -73,6 +74,9 @@ devloc.o: $(PORT)/devloc.c Makefile misc.o: $(PORT)/misc.c Makefile $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/misc.c +superHspecific.o: $(PORT)/superHspecific.c Makefile + $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/superHspecific.c + init.o: init.S $(CPP) init.S > init.i; $(AS) init.i -o $@ diff --git a/benchmarks/source/superh/sbench/DAM+S-MAC/damv2.c b/benchmarks/source/superh/sbench/DAM+S-MAC/damv2.c index 16a416a4..c0c31fec 100755 --- a/benchmarks/source/superh/sbench/DAM+S-MAC/damv2.c +++ b/benchmarks/source/superh/sbench/DAM+S-MAC/damv2.c @@ -23,14 +23,15 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devmac.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../../port/devnet.h" +#include "../../../port/devmac.h" +#include "../../../port/devrtc.h" +#include "../../../port/devexcp.h" +#include "../../../port/devlog.h" +#include "../../../port/devloc.h" +#include "../../../port/devsensor.h" +#include "../../../port/misc.h" +#include "../../../port/superHspecific.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" diff --git a/benchmarks/source/superh/sbench/DAM+Sift+EAR/Makefile b/benchmarks/source/superh/sbench/DAM+Sift+EAR/Makefile index ef22a7ec..44e2bccd 100755 --- a/benchmarks/source/superh/sbench/DAM+Sift+EAR/Makefile +++ b/benchmarks/source/superh/sbench/DAM+Sift+EAR/Makefile @@ -14,7 +14,7 @@ MACPATH = ../Sift-MAC LIBOS = eOS -PORT = ../../port +PORT = ../../../port LIBOS = eOS SIMDIR = $(TREEROOT)/sim TOOLSLIB = $(TREEROOT)/tools/tools-lib @@ -36,6 +36,7 @@ NODEOBJS =\ devloc.o\ devnet.o\ devmac.o\ + superHspecific.o\ $(MAC).o\ $(ROUTE).o\ $(PROGRAM).o\ @@ -111,6 +112,9 @@ devloc.o: $(PORT)/devloc.c Makefile misc.o: $(PORT)/misc.c Makefile $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/misc.c +superHspecific.o: $(PORT)/superHspecific.c Makefile + $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/superHspecific.c + init.o: init.S $(CPP) init.S > init.i; $(AS) init.i -o $@ diff --git a/benchmarks/source/superh/sbench/DAM+Sift+EAR/sink.c b/benchmarks/source/superh/sbench/DAM+Sift+EAR/sink.c index 04e7df34..a084476d 100644 --- a/benchmarks/source/superh/sbench/DAM+Sift+EAR/sink.c +++ b/benchmarks/source/superh/sbench/DAM+Sift+EAR/sink.c @@ -11,15 +11,16 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devmac.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devrand.h" -#include "devsensor.h" -#include "misc.h" +#include "../../../port/devnet.h" +#include "../../../port/devmac.h" +#include "../../../port/devrtc.h" +#include "../../../port/devexcp.h" +#include "../../../port/devlog.h" +#include "../../../port/devloc.h" +#include "../../../port/devrand.h" +#include "../../../port/devsensor.h" +#include "../../../port/misc.h" +#include "../../../port/superHspecific.c" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" diff --git a/benchmarks/source/superh/sbench/DAM+Sift/Makefile b/benchmarks/source/superh/sbench/DAM+Sift/Makefile index 23c1eb8c..c04c06fe 100755 --- a/benchmarks/source/superh/sbench/DAM+Sift/Makefile +++ b/benchmarks/source/superh/sbench/DAM+Sift/Makefile @@ -10,7 +10,7 @@ MAC = sift-mac MACPATH = ../Sift-MAC LIBOS = eOS -PORT = ../../port +PORT = ../../../port LIBOS = eOS SIMDIR = $(TREEROOT)/sim TOOLSLIB = $(TREEROOT)/tools/tools-lib @@ -29,6 +29,7 @@ OBJS =\ devsensor.o\ devloc.o\ devmac.o\ + superHspecific.o\ $(MAC).o\ $(PROGRAM).o\ @@ -74,6 +75,9 @@ devloc.o: $(PORT)/devloc.c Makefile misc.o: $(PORT)/misc.c Makefile $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/misc.c +superHspecific.o: $(PORT)/superHspecific.c Makefile + $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/superHspecific.c + init.o: init.S $(CPP) init.S > init.i; $(AS) init.i -o $@ diff --git a/benchmarks/source/superh/sbench/DAM+Sift/damv2.c b/benchmarks/source/superh/sbench/DAM+Sift/damv2.c index 50810eb4..464328ac 100755 --- a/benchmarks/source/superh/sbench/DAM+Sift/damv2.c +++ b/benchmarks/source/superh/sbench/DAM+Sift/damv2.c @@ -23,12 +23,13 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../../port/devrtc.h" +#include "../../../port/devexcp.h" +#include "../../../port/devlog.h" +#include "../../../port/devloc.h" +#include "../../../port/devsensor.h" +#include "../../../port/misc.h" +#include "../../../port/superHspecific.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" diff --git a/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/Makefile b/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/Makefile index ba8c17b7..7a4ea7d6 100755 --- a/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/Makefile +++ b/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/Makefile @@ -11,7 +11,7 @@ ROUTE = ear-route ROUTEPATH = ../EAR-route LIBOS = eOS -PORT = ../../port +PORT = ../../../port LIBOS = eOS SIMDIR = $(TREEROOT)/sim TOOLSLIB = $(TREEROOT)/tools/tools-lib @@ -33,6 +33,7 @@ NODEOBJS =\ devloc.o\ devnet.o\ devmac.o\ + superHspecific.o\ $(ROUTE).o\ $(PROGRAM).o\ @@ -46,6 +47,7 @@ SINKOBJS =\ devloc.o\ devnet.o\ devmac.o\ + superHspecific.o\ $(ROUTE).o\ $(SINK).o\ @@ -103,6 +105,9 @@ devloc.o: $(PORT)/devloc.c Makefile misc.o: $(PORT)/misc.c Makefile $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/misc.c +superHspecific.o: $(PORT)/superHspecific.c Makefile + $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/superHspecific.c + init.o: init.S $(CPP) init.S > init.i; $(AS) init.i -o $@ diff --git a/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/damv2.c b/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/damv2.c index b9d646d4..d902affb 100755 --- a/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/damv2.c +++ b/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/damv2.c @@ -23,14 +23,15 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devmac.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../../port/devnet.h" +#include "../../../port/devmac.h" +#include "../../../port/devrtc.h" +#include "../../../port/devexcp.h" +#include "../../../port/devlog.h" +#include "../../../port/devloc.h" +#include "../../../port/devsensor.h" +#include "../../../port/misc.h" +#include "../../../port/superHspecific.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" diff --git a/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/sink.c b/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/sink.c index 76332289..60f53ea7 100644 --- a/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/sink.c +++ b/benchmarks/source/superh/sbench/DAM+idealHWMAC+EAR/sink.c @@ -11,15 +11,16 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devmac.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devrand.h" -#include "devsensor.h" -#include "misc.h" +#include "../../../port/devnet.h" +#include "../../../port/devmac.h" +#include "../../../port/devrtc.h" +#include "../../../port/devexcp.h" +#include "../../../port/devlog.h" +#include "../../../port/devloc.h" +#include "../../../port/devrand.h" +#include "../../../port/devsensor.h" +#include "../../../port/misc.h" +#include "../../../port/superHspecific.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" diff --git a/benchmarks/source/superh/sbench/PARC-damv2/Makefile b/benchmarks/source/superh/sbench/PARC-damv2/Makefile index 2c670132..b13db9e9 100755 --- a/benchmarks/source/superh/sbench/PARC-damv2/Makefile +++ b/benchmarks/source/superh/sbench/PARC-damv2/Makefile @@ -8,7 +8,7 @@ TARGET-ARCH = sh-elf PROGRAM = damv2 LIBOS = eOS -PORT = ../../port +PORT = ../../../port LIBOS = eOS SIMDIR = $(TREEROOT)/sim TOOLSLIB = $(TREEROOT)/tools/tools-lib @@ -26,6 +26,7 @@ OBJS =\ misc.o\ devsensor.o\ devloc.o\ + superHspecific.o\ $(PROGRAM).o\ @@ -64,6 +65,9 @@ devloc.o: $(PORT)/devloc.c Makefile misc.o: $(PORT)/misc.c Makefile $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/misc.c +superHspecific.o: $(PORT)/superHspecific.c Makefile + $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/superHspecific.c + init.o: init.S $(CPP) init.S > init.i; $(AS) init.i -o $@ diff --git a/benchmarks/source/superh/sbench/PARC-damv2/damv2.c b/benchmarks/source/superh/sbench/PARC-damv2/damv2.c index 1d7e7de5..ace744a1 100755 --- a/benchmarks/source/superh/sbench/PARC-damv2/damv2.c +++ b/benchmarks/source/superh/sbench/PARC-damv2/damv2.c @@ -23,13 +23,14 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../../port/devnet.h" +#include "../../../port/devrtc.h" +#include "../../../port/devexcp.h" +#include "../../../port/devlog.h" +#include "../../../port/devloc.h" +#include "../../../port/devsensor.h" +#include "../../../port/misc.h" +#include "../../../port/superHspecific.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" diff --git a/benchmarks/source/superh/sbench/PARC-damv2/test.m b/benchmarks/source/superh/sbench/PARC-damv2/test.m index b1807a0f..ac588c08 100755 --- a/benchmarks/source/superh/sbench/PARC-damv2/test.m +++ b/benchmarks/source/superh/sbench/PARC-damv2/test.m @@ -31,14 +31,14 @@ -- With 400 samples in locdata, total distance of 40in, and trajectoryrate of 100, -- trajectory speed is 0.254 m/s (0.5681 mph = 0.8333 ft/s) -- -sigsrc 0 "Gaussian lightsource 1" 0.0 0.0 0.0 0.0 0.0 0.0 0.997356 -0.5 0.0 0.0 0.0 2.71828 0.0 0.0 0.0 0.0 2.0 0.0 0.0 0.0 "dam.locdata.1" 100 0.0 0.0 0.0 1 " " 0 1000.0 1 +sigsrc 0 "Gaussian lightsource 1" 0.0 0.0 0.0 0.0 0.0 0.0 0.997356 -0.5 0.0 0.0 0.0 2.71828 0.0 0.0 0.0 0.0 2.0 0.0 0.0 0.0 "dam.locdata.1" 100 0.0 0.0 0.0 1 " " 0 1000.0 1 1 -sigsrc 0 "Gaussian lightsource 2" 0.0 0.0 0.0 0.0 0.0 0.0 0.997356 -0.5 0.0 0.0 0.0 2.71828 0.0 0.0 0.0 0.0 2.0 0.0 0.0 0.0 "dam.locdata.2" 100 0.0 0.0 0.0 1 " " 0 1000.0 1 +sigsrc 0 "Gaussian lightsource 2" 0.0 0.0 0.0 0.0 0.0 0.0 0.997356 -0.5 0.0 0.0 0.0 2.71828 0.0 0.0 0.0 0.0 2.0 0.0 0.0 0.0 "dam.locdata.2" 100 0.0 0.0 0.0 1 " " 0 1000.0 1 1 -- -- Signal source 2. Ambient light at 0.1 Lux -- -sigsrc 0 "Ambient light" 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 " " 0 0.0 0.0 0.0 1 " " 0 0.1 1 +sigsrc 0 "Ambient light" 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 " " 0 0.0 0.0 0.0 1 " " 0 0.1 1 1 @@ -51,12 +51,12 @@ -- we use a Ricean model for the RF propagation, w/ received Pr = K/d^n, n = 2 -- We set ambient RF noise at 1/100 of the Peak radio power. -- -sigsrc 1 "Radio propagation model" 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 -2.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 " " 0 0.0 0.0 0.0 1 " " 0 0.0 1 +sigsrc 1 "Radio propagation model" 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 -2.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 " " 0 0.0 0.0 0.0 1 " " 0 0.0 1 1 -- Signal source 4 -- We set ambient RF sig strength to equal 1/10 strength of 89.1mW -- radio at sqrt(10^2+10^2)=14.14 units, and set minsnr to 9 (9 < 10) -sigsrc 1 "Ambient RF noise" 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 " " 0 0.0 0.0 0.0 1 " " 0 0.00004455 1 +sigsrc 1 "Ambient RF noise" 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 " " 0 0.0 0.0 0.0 1 " " 0 0.00004455 1 1 -- diff --git a/benchmarks/source/superh/sbench/S-MAC/s-mac.c b/benchmarks/source/superh/sbench/S-MAC/s-mac.c index 118c391b..24ab530d 100644 --- a/benchmarks/source/superh/sbench/S-MAC/s-mac.c +++ b/benchmarks/source/superh/sbench/S-MAC/s-mac.c @@ -6,6 +6,7 @@ #include "errors.h" #include "sf-includes.h" #include "s-mac.h" +#include "../../../port/superHspecific.h" /* */ /* A (portable?) S-MAC implementation */ diff --git a/benchmarks/source/superh/swradio/swradio-demod/Makefile b/benchmarks/source/superh/swradio/swradio-demod/Makefile index b11b7b73..8a096f19 100755 --- a/benchmarks/source/superh/swradio/swradio-demod/Makefile +++ b/benchmarks/source/superh/swradio/swradio-demod/Makefile @@ -8,7 +8,7 @@ TARGET-ARCH = sh-elf PROGRAM = swradiodemod LIBOS = eOS -PORT = ../../port +PORT = ../../../port INCLUDEDIR = $(TREEROOT)/sys/include TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I$(INCLUDEDIR) -I../ -I../../port -I$(TREEROOT)/sys/libOS/port -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/sim diff --git a/benchmarks/source/superh/swradio/swradio-demod/swradiodemod.c b/benchmarks/source/superh/swradio/swradio-demod/swradiodemod.c index f99a5dfd..4a98b94d 100755 --- a/benchmarks/source/superh/swradio/swradio-demod/swradiodemod.c +++ b/benchmarks/source/superh/swradio/swradio-demod/swradiodemod.c @@ -12,14 +12,15 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devrand.h" -#include "devrtc.h" -#include "devloc.h" -#include "devlog.h" -#include "devexcp.h" +#include "../../port/devnet.h" +#include "../../port/devrand.h" +#include "../../port/devrtc.h" +#include "../../port/devloc.h" +#include "../../port/devlog.h" +#include "../../port/devexcp.h" +#include "../../port/superHspecific.h" #include "print.h" -#include "misc.h" +#include "../../port/misc.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" @@ -45,7 +46,7 @@ extern uchar* strncpy(uchar *s1, uchar *s2, ulong n); extern void* memmove(void *, void *, long); -void +int main(void) { void (*fptr)() = (void *)0x8001000; @@ -134,7 +135,7 @@ main(void) fptr(); - return; + return 0; } diff --git a/benchmarks/source/superh/swradio/swradio-eq/Makefile b/benchmarks/source/superh/swradio/swradio-eq/Makefile index d926263d..b4fdcee2 100755 --- a/benchmarks/source/superh/swradio/swradio-eq/Makefile +++ b/benchmarks/source/superh/swradio/swradio-eq/Makefile @@ -8,7 +8,7 @@ TARGET-ARCH = sh-elf PROGRAM = swradioeq LIBOS = eOS -PORT = ../../port +PORT = ../../../port INCLUDEDIR = $(TREEROOT)/sys/include TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I$(INCLUDEDIR) -I../ -I../../port -I$(TREEROOT)/sys/libOS/port -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/sim diff --git a/benchmarks/source/superh/swradio/swradio-eq/swradioeq.c b/benchmarks/source/superh/swradio/swradio-eq/swradioeq.c index 50eacbed..19ec287c 100755 --- a/benchmarks/source/superh/swradio/swradio-eq/swradioeq.c +++ b/benchmarks/source/superh/swradio/swradio-eq/swradioeq.c @@ -12,14 +12,15 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devrand.h" -#include "devrtc.h" -#include "devloc.h" -#include "devlog.h" -#include "devexcp.h" +#include "../../../port/devnet.h" +#include "../../../port/devrand.h" +#include "../../../port/devrtc.h" +#include "../../../port/devloc.h" +#include "../../../port/devlog.h" +#include "../../../port/devexcp.h" +#include "../../../port/superHspecific.h" #include "print.h" -#include "misc.h" +#include "../../port/misc.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" @@ -60,7 +61,7 @@ float eq_cutoffs[EQUALIZER_BANDS + 1] = 1760.00 }; -void +int main(void) { /* Monitor code is @ 0x8001000 */ @@ -140,7 +141,7 @@ main(void) fptr(); - return; + return 0; } void diff --git a/benchmarks/source/superh/swradio/swradio-lpf/Makefile b/benchmarks/source/superh/swradio/swradio-lpf/Makefile index 4839eee1..5db7d5b8 100755 --- a/benchmarks/source/superh/swradio/swradio-lpf/Makefile +++ b/benchmarks/source/superh/swradio/swradio-lpf/Makefile @@ -8,7 +8,7 @@ TARGET-ARCH = sh-elf PROGRAM = swradiolpf LIBOS = eOS -PORT = ../../port +PORT = ../../../port INCLUDEDIR = $(TREEROOT)/sys/include TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I$(INCLUDEDIR) -I../ -I../../port -I$(TREEROOT)/sys/libOS/port -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/sim diff --git a/benchmarks/source/superh/swradio/swradio-lpf/swradiolpf.c b/benchmarks/source/superh/swradio/swradio-lpf/swradiolpf.c index a56c54e3..c3aae9dd 100755 --- a/benchmarks/source/superh/swradio/swradio-lpf/swradiolpf.c +++ b/benchmarks/source/superh/swradio/swradio-lpf/swradiolpf.c @@ -12,14 +12,15 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devrand.h" -#include "devrtc.h" -#include "devloc.h" -#include "devlog.h" -#include "devexcp.h" +#include "../../port/devnet.h" +#include "../../port/devrand.h" +#include "../../port/devrtc.h" +#include "../../port/devloc.h" +#include "../../port/devlog.h" +#include "../../port/devexcp.h" +#include "../../port/superHspecific.h" #include "print.h" -#include "misc.h" +#include "../../port/misc.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" @@ -45,7 +46,7 @@ extern uchar* strncpy(uchar *s1, uchar *s2, ulong n); extern void* memmove(void *, void *, long); -void +int main(void) { /* Monitor code is @ 0x8001000 */ @@ -160,7 +161,7 @@ main(void) fptr(); - return; + return 0; } diff --git a/benchmarks/source/superh/swradio/swradio-sink/Makefile b/benchmarks/source/superh/swradio/swradio-sink/Makefile index 7ad615af..452540dc 100755 --- a/benchmarks/source/superh/swradio/swradio-sink/Makefile +++ b/benchmarks/source/superh/swradio/swradio-sink/Makefile @@ -9,7 +9,7 @@ PROGRAM = swradiosink LIBOS1 = mOS LIBOS2 = eOS -PORT = ../../port +PORT = ../../../port INCLUDEDIR = $(TREEROOT)/sys/include TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I$(INCLUDEDIR) -I../ -I../../port -I$(TREEROOT)/sys/libOS/port -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/sim diff --git a/benchmarks/source/superh/swradio/swradio-sink/swradiosink.c b/benchmarks/source/superh/swradio/swradio-sink/swradiosink.c index b2c6e523..3210e05a 100755 --- a/benchmarks/source/superh/swradio/swradio-sink/swradiosink.c +++ b/benchmarks/source/superh/swradio/swradio-sink/swradiosink.c @@ -12,11 +12,12 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "misc.h" +#include "../../../port/devnet.h" +#include "../../../port/devrtc.h" +#include "../../../port/devexcp.h" +#include "../../../port/devlog.h" +#include "../../../port/misc.h" +#include "../../../port/superHspecific.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" @@ -51,7 +52,7 @@ extern void* memmove(void *, void *, long); -void +int main(void) { void (*fptr)() = (void *)0x8001000; @@ -97,7 +98,7 @@ main(void) - return; + return 0; } diff --git a/benchmarks/source/superh/swradio/swradio-source/Makefile b/benchmarks/source/superh/swradio/swradio-source/Makefile index c72ba3d5..72b0e85a 100755 --- a/benchmarks/source/superh/swradio/swradio-source/Makefile +++ b/benchmarks/source/superh/swradio/swradio-source/Makefile @@ -8,7 +8,7 @@ TARGET-ARCH = sh-elf PROGRAM = swradiosource LIBOS = eOS -PORT = ../../port +PORT = ../../../port INCLUDEDIR = $(TREEROOT)/sys/include TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I$(INCLUDEDIR) -I../ -I../../port -I$(TREEROOT)/sys/libOS/port -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/sim @@ -22,6 +22,7 @@ OBJS =\ devrtc.o\ devexcp.o\ misc.o\ + superHspecific.o\ $(PROGRAM).o\ swradio-common.o\ @@ -58,6 +59,9 @@ devlog.o: $(PORT)/devlog.c Makefile misc.o: $(PORT)/misc.c Makefile $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/misc.c +superHspecific.o: $(PORT)/superHspecific.c Makefile + $(CC) $(CFLAGS) $(OPTFLAGS) $(INCLUDES) -c $(PORT)/superHspecific.c + init.o: init.S $(CPP) init.S > init.i; $(AS) init.i -o $@ diff --git a/benchmarks/source/superh/swradio/swradio-source/asm.h b/benchmarks/source/superh/swradio/swradio-source/asm.h index 654604ac..cf4d7534 100755 --- a/benchmarks/source/superh/swradio/swradio-source/asm.h +++ b/benchmarks/source/superh/swradio/swradio-source/asm.h @@ -1 +1 @@ -#define MOVL MOV.L \ No newline at end of file +#define MOVL MOV.L diff --git a/benchmarks/source/superh/swradio/swradio-source/swradiosource.c b/benchmarks/source/superh/swradio/swradio-source/swradiosource.c index dfada8a8..b70468f1 100755 --- a/benchmarks/source/superh/swradio/swradio-source/swradiosource.c +++ b/benchmarks/source/superh/swradio/swradio-source/swradiosource.c @@ -11,11 +11,12 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devnet.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "misc.h" +#include "../../../port/devnet.h" +#include "../../../port/devrtc.h" +#include "../../../port/devexcp.h" +#include "../../../port/devlog.h" +#include "../../../port/misc.h" +#include "../../../port/superHspecific.h" #include "fault.h" #include "physics.h" #include "interrupts-hitachi-sh.h" @@ -49,7 +50,7 @@ enum }; -void +int main(void) { FloatBuffer fb1; @@ -177,7 +178,7 @@ main(void) } - return; + return 0; } diff --git a/benchmarks/source/superh/twoVirtualSensorsExample/Makefile b/benchmarks/source/superh/twoVirtualSensorsExample/Makefile index 9b59cb9f..e9afcc0d 100644 --- a/benchmarks/source/superh/twoVirtualSensorsExample/Makefile +++ b/benchmarks/source/superh/twoVirtualSensorsExample/Makefile @@ -6,7 +6,7 @@ TARGET-ARCH = sh-elf PROGRAM = virtualSensorExample -PORT = ../port +PORT = ../../port LIBOS = mOS TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I../port/ -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/benchmarks/include -I$(TREEROOT)/sys/libOS/port diff --git a/benchmarks/source/superh/twoVirtualSensorsExample/virtualSensorExample.c b/benchmarks/source/superh/twoVirtualSensorsExample/virtualSensorExample.c index 8709d95d..cfa2c4f8 100644 --- a/benchmarks/source/superh/twoVirtualSensorsExample/virtualSensorExample.c +++ b/benchmarks/source/superh/twoVirtualSensorsExample/virtualSensorExample.c @@ -8,12 +8,12 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../port/devrtc.h" +#include "../../port/devexcp.h" +#include "../../port/devlog.h" +#include "../../port/devloc.h" +#include "../../port/devsensor.h" +#include "../../port/misc.h" #include "print.h" float findMean(float samples[], int size); diff --git a/benchmarks/source/superh/virtualSensorExample/Makefile b/benchmarks/source/superh/virtualSensorExample/Makefile index cf90d77c..1294ad86 100644 --- a/benchmarks/source/superh/virtualSensorExample/Makefile +++ b/benchmarks/source/superh/virtualSensorExample/Makefile @@ -6,7 +6,7 @@ TARGET-ARCH = sh-elf PROGRAM = virtualSensorExample -PORT = ../port +PORT = ../../port LIBOS = mOS TOOLSLIB = $(TREEROOT)/tools/tools-lib INCLUDES = -I../port/ -I$(TREEROOT)/sys/include -I$(TREEROOT)/sys/kern/superH -I$(TREEROOT)/benchmarks/include -I$(TREEROOT)/sys/libOS/port diff --git a/benchmarks/source/superh/virtualSensorExample/virtualSensorExample.c b/benchmarks/source/superh/virtualSensorExample/virtualSensorExample.c index f30f48de..4a786a98 100644 --- a/benchmarks/source/superh/virtualSensorExample/virtualSensorExample.c +++ b/benchmarks/source/superh/virtualSensorExample/virtualSensorExample.c @@ -8,12 +8,12 @@ #include "devsim7708.h" #include "sh7708.h" #include "devscc.h" -#include "devrtc.h" -#include "devexcp.h" -#include "devlog.h" -#include "devloc.h" -#include "devsensor.h" -#include "misc.h" +#include "../../port/devrtc.h" +#include "../../port/devexcp.h" +#include "../../port/devlog.h" +#include "../../port/devloc.h" +#include "../../port/devsensor.h" +#include "../../port/misc.h" #include "print.h" volatile float dam_myPr = 0.0;