voc-version added

voc-O7/Makefile

@@ -1,4 +1,4 @@
-aLL: O7ARMv7MPCompile O7ARMv7MToolDecObj O7ARMv7MToolDecSym O7ARMv7MToolDecBin O7ARMv7MToolDecHex O7ARMv7MLinkerLink
+all: O7ARMv7MPCompile O7ARMv7MToolDecObj O7ARMv7MToolDecSym O7ARMv7MToolDecBin O7ARMv7MToolDecHex O7ARMv7MLinkerLink
 
 O7ARMv7MPCompile: O7ARMv7MP.o O7ARMv7MPCompile.Mod
 	voc -OC O7ARMv7MPCompile.Mod -m
@@ -43,4 +43,15 @@ O7ARMv7MLinker.o: O7ARMv6M.o O7ARMv7M.o O7ARMv7MLinker.Mod
 	voc -OC -c O7ARMv7MLinker.Mod
 
 clean:
-	rm -f *.c *.o *.h *.sym O7ARMv7MPCompile O7ARMv7MToolDecObj O7ARMv7MToolDecSym O7ARMv7MToolDecBin O7ARMv7MToolDecHex O7ARMv7MLinkerLink
+	rm -f *.o *.sym \
+		O7S.c O7S.h \
+		O7B.c O7B.h \
+		O7ARMv6M.c O7ARMv6M.h \
+		O7ARMv7M.c O7ARMv7M.h \
+		O7ARMv7MG.c O7ARMv7MG.h \
+		O7ARMv7MP.c O7ARMv7MP.h \
+		O7ARMv7MLinker.c O7ARMv7MLinker.h \
+		O7ARMv7MTool.c O7ARMv7MTool.h \
+		O7ARMv7MPCompile.c O7ARMv7MLinkerLink.c \
+		O7ARMv7MToolDecObj.c O7ARMv7MToolDecSym.c O7ARMv7MToolDecBin.c O7ARMv7MToolDecHex.c \
+		O7ARMv7MPCompile O7ARMv7MToolDecObj O7ARMv7MToolDecSym O7ARMv7MToolDecBin O7ARMv7MToolDecHex O7ARMv7MLinkerLink

voc-O7/O7ARMv6M.Mod

@@ -9,11 +9,6 @@ http://ecee.colorado.edu/ecen3000/labs/lab3/files/DDI0419C_arm_architecture_v6m_
 
 	IMPORT SYSTEM, Strings := VT100, Out;
 
-(*
-	TYPE
-		LONGINT = INTEGER;
-*)
-
 	CONST
 		(* registers *)
 			R0* = 0; R1* = 1; R2* = 2; R3* = 3;
@@ -153,24 +148,10 @@ http://ecee.colorado.edu/ecen3000/labs/lab3/files/DDI0419C_arm_architecture_v6m_
 		code[pc] := 4380H + m * 8 + dn; INC(pc)
 	END EmitBICSR;
 
-(*
 	PROCEDURE DecodeBLabel24* (S, imm10, J1, J2, imm11: INTEGER): INTEGER;
 	BEGIN
 		RETURN ((S * 1000000H + (J1 + S + 1) MOD 2 * 800000H + (J2 + S + 1) MOD 2 * 400000H + imm10 * 1000H + imm11 * 2) * 80H) DIV 80H
 	END DecodeBLabel24;
-*)
-
-	PROCEDURE DecodeBLabel24* (S, imm10, J1, J2, imm11: INTEGER): INTEGER;
-		VAR t0, t1, t2, t3, t4, t5: INTEGER;
-	BEGIN
-		t0 := S * 1000000H;
-		t1 := ((J1 + S + 1) MOD 2) * 800000H;
-		t2 := ((J2 + S + 1) MOD 2) * 400000H;
-		t3 := imm10 * 1000H;
-		t4 := imm11 * 2;
-		t5 := (t0 + t1 + t2 + t3 + t4) * 80H;
-		RETURN t5 DIV 80H
-	END DecodeBLabel24;
 
 	PROCEDURE EncodeBLabel24* (off: INTEGER; (*OUT*)VAR S, imm10, J1, J2, imm11: INTEGER);
 		VAR test: INTEGER;

voc-O7/O7ARMv7MP.Mod

@@ -23,8 +23,10 @@ MODULE O7ARMv7MP; (*N. Wirth 1.7.97 / 8.2.2020	Oberon compiler for RISC in Obero
 			newsf = 0;
 			defopt = {newsf};
 
+(*
 		(* DevCompiler: additional scanner types *)
 			import = 100; module = 101; semicolon = 102; becomes = 103; comEnd = 104;
+*)
 
 	TYPE PtrBase = POINTER TO PtrBaseDesc;
 		PtrBaseDesc = RECORD	(*list of names of pointer base types*)