Merge pull request #194 from JamesTimothyMeech/master

Issue #193 Move portable code in port out of superh for use in riscv
physical-computation · Jan 14, 2021 · 703d013 · 703d013
2 parents c2867f8 + 9194490
commit 703d013
Show file tree

Hide file tree

Showing 65 changed files with 232 additions and 184 deletions.
diff --git a/benchmarks/source/superh/port/devexcp.c → benchmarks/source/port/devexcp.c b/benchmarks/source/superh/port/devexcp.c → benchmarks/source/port/devexcp.c
diff --git a/benchmarks/source/superh/port/devexcp.h → benchmarks/source/port/devexcp.h b/benchmarks/source/superh/port/devexcp.h → benchmarks/source/port/devexcp.h
diff --git a/benchmarks/source/superh/port/devloc.c → benchmarks/source/port/devloc.c b/benchmarks/source/superh/port/devloc.c → benchmarks/source/port/devloc.c
diff --git a/benchmarks/source/superh/port/devloc.h → benchmarks/source/port/devloc.h b/benchmarks/source/superh/port/devloc.h → benchmarks/source/port/devloc.h
diff --git a/benchmarks/source/superh/port/devlog.c → benchmarks/source/port/devlog.c b/benchmarks/source/superh/port/devlog.c → benchmarks/source/port/devlog.c
diff --git a/benchmarks/source/superh/port/devlog.h → benchmarks/source/port/devlog.h b/benchmarks/source/superh/port/devlog.h → benchmarks/source/port/devlog.h
diff --git a/benchmarks/source/superh/port/devmac.c → benchmarks/source/port/devmac.c b/benchmarks/source/superh/port/devmac.c → benchmarks/source/port/devmac.c
diff --git a/benchmarks/source/superh/port/devmac.h → benchmarks/source/port/devmac.h b/benchmarks/source/superh/port/devmac.h → benchmarks/source/port/devmac.h
diff --git a/benchmarks/source/superh/port/devnet.c → benchmarks/source/port/devnet.c b/benchmarks/source/superh/port/devnet.c → benchmarks/source/port/devnet.c
diff --git a/benchmarks/source/superh/port/devnet.h → benchmarks/source/port/devnet.h b/benchmarks/source/superh/port/devnet.h → benchmarks/source/port/devnet.h
diff --git a/benchmarks/source/superh/port/devrand.c → benchmarks/source/port/devrand.c b/benchmarks/source/superh/port/devrand.c → benchmarks/source/port/devrand.c
diff --git a/benchmarks/source/superh/port/devrand.h → benchmarks/source/port/devrand.h b/benchmarks/source/superh/port/devrand.h → benchmarks/source/port/devrand.h
diff --git a/benchmarks/source/superh/port/devrtc.c → benchmarks/source/port/devrtc.c b/benchmarks/source/superh/port/devrtc.c → benchmarks/source/port/devrtc.c
diff --git a/benchmarks/source/superh/port/devrtc.h → benchmarks/source/port/devrtc.h b/benchmarks/source/superh/port/devrtc.h → benchmarks/source/port/devrtc.h
diff --git a/benchmarks/source/superh/port/devsensor.c → benchmarks/source/port/devsensor.c b/benchmarks/source/superh/port/devsensor.c → benchmarks/source/port/devsensor.c
diff --git a/benchmarks/source/superh/port/devsensor.h → benchmarks/source/port/devsensor.h b/benchmarks/source/superh/port/devsensor.h → benchmarks/source/port/devsensor.h
diff --git a/benchmarks/source/superh/port/logmarkers.h → benchmarks/source/port/logmarkers.h b/benchmarks/source/superh/port/logmarkers.h → benchmarks/source/port/logmarkers.h
diff --git a/benchmarks/source/superh/port/misc.c → benchmarks/source/port/misc.c b/benchmarks/source/superh/port/misc.c → 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 → benchmarks/source/port/misc.h b/benchmarks/source/superh/port/misc.h → 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
@@ -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
@@ -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
@@ -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
@@ -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 <math.h>
 #include <complex.h>

diff --git 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
@@ -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 <math.h>
 #include <complex.h>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 $@