Correct offset error for load /store with offset larger than 255

Author: ursgraf

microzedjunitTarget.deep

@@ -39,11 +39,12 @@ project junitTargetTestProject {
 #	rootclasses = "org.deepjava.comp.targettest.casts.ByteCastTest","org.deepjava.comp.targettest.casts.ShortCastTest","org.deepjava.comp.targettest.casts.CharCastTest","org.deepjava.comp.targettest.casts.IntCastTest","org.deepjava.comp.targettest.casts.LongCastTest","org.deepjava.comp.targettest.casts.FloatCastTest","org.deepjava.comp.targettest.casts.DoubleCastTest";
 
 #	Tests for all objects  
-#	rootclasses = "org.deepjava.comp.targettest.objects.InstanceTest","org.deepjava.comp.targettest.objects.InheritanceTest","org.deepjava.comp.targettest.objects.InterfaceTest","org.deepjava.comp.targettest.objects.EnumTest";
+#	rootclasses = "org.deepjava.comp.targettest.objects.InstanceTest","org.deepjava.comp.targettest.objects.InheritanceTest","org.deepjava.comp.targettest.objects.InterfaceTest","org.deepjava.comp.targettest.objects.EnumTest","org.deepjava.comp.targettest.objects.FieldTest";
 #	rootclasses = "org.deepjava.comp.targettest.objects.InstanceTest","org.deepjava.comp.targettest.objects.InterfaceTest";
 #	rootclasses = "org.deepjava.comp.targettest.objects.InheritanceTest","org.deepjava.comp.targettest.objects.InterfaceTest";
 #	rootclasses = "org.deepjava.comp.targettest.objects.InterfaceTest";
 #	rootclasses = "org.deepjava.comp.targettest.objects.EnumTest";
+#	rootclasses = "org.deepjava.comp.targettest.objects.FieldTest";
 
 #	Tests for all various  
 #	rootclasses = "org.deepjava.comp.targettest.various.StackFrame","org.deepjava.comp.targettest.various.ParameterPassing","org.deepjava.comp.targettest.various.RegisterAllocation";
@@ -58,7 +59,7 @@ project junitTargetTestProject {
 				  "org.deepjava.comp.targettest.arrays.ArrayTest","org.deepjava.comp.targettest.arrays.ArrayTwoDimTest","org.deepjava.comp.targettest.arrays.ArrayThreeDimTest","org.deepjava.comp.targettest.arrays.ArrayInstanceTest","org.deepjava.comp.targettest.arrays.StringTest",
 				  "org.deepjava.comp.targettest.unsafe.UnsafeTestARM","org.deepjava.comp.targettest.unsafe.LowLevelTest",
 				  "org.deepjava.comp.targettest.casts.ByteCastTest","org.deepjava.comp.targettest.casts.ShortCastTest","org.deepjava.comp.targettest.casts.CharCastTest","org.deepjava.comp.targettest.casts.IntCastTest","org.deepjava.comp.targettest.casts.LongCastTest","org.deepjava.comp.targettest.casts.FloatCastTest","org.deepjava.comp.targettest.casts.DoubleCastTest",
-				  "org.deepjava.comp.targettest.objects.InstanceTest","org.deepjava.comp.targettest.objects.InheritanceTest","org.deepjava.comp.targettest.objects.InterfaceTest","org.deepjava.comp.targettest.objects.EnumTest",
+				  "org.deepjava.comp.targettest.objects.InstanceTest","org.deepjava.comp.targettest.objects.InheritanceTest","org.deepjava.comp.targettest.objects.InterfaceTest","org.deepjava.comp.targettest.objects.EnumTest","org.deepjava.comp.targettest.objects.FieldTest",
 				  "org.deepjava.comp.targettest.various.StackFrame","org.deepjava.comp.targettest.various.ParameterPassing","org.deepjava.comp.targettest.various.RegisterAllocation",
 				  "org.deepjava.comp.targettest.exceptions.UncheckedExceptionTest","org.deepjava.comp.targettest.exceptions.CheckedExceptionTest","org.deepjava.comp.targettest.exceptions.FinallyExceptionTest";
 

rsc/ErrorMsg.txt

@@ -85,6 +85,7 @@ ErrorNr;Description;Solution
 640;SSA has exit set with more entries than maximum number of join values;
 650;branch offset out of range;
 651;immediate out of range;
+652;opCode not implemented;
 
 701;class not loaded;
 702;class not found;

src/org/deepjava/cg/arm/CodeGenARM.java

@@ -2600,12 +2600,14 @@ else if (bci == bCifle)
 		}
 	}
 
+	// checks if a value can be packed into ARM's 12 bit packed format
 	private boolean isPackable(int val) {
 		int lead = Integer.numberOfLeadingZeros(val);
 		lead -= lead % 2;	// make even, immediate operands can be shifted by an even number only
 		return lead + Integer.numberOfTrailingZeros(val) >= 24;		
 	}
 
+	// packs a value into ARM's 12 bit packed format
 	private int packImmediate(int immVal) {
 		int val = Integer.numberOfLeadingZeros(immVal);
 		val -= val % 2;	// make even
@@ -3202,12 +3204,30 @@ private void createBranchReg(Code32 code, int op, int cond, int Rm) {
 
 	// load/store word and unsigned byte (immediate)	(LDR, LDRB, STR, STRB, LDRH, LDRSH, LDRSB, STRH)
 	// P = 1 -> preindexed, U = 1 -> add offset, W = 1 -> write back
-	private void createLSWordImm(Code32 code, int opCode, int cond, int Rt, int Rn, int imm12, int P, int U, int W) {
-		if (opCode == armLdr || opCode == armLdrb || opCode == armStr || opCode == armStrb)
-			code.instructions[code.iCount] = (cond << 28) | opCode | (Rt << 12) | (Rn << 16) | (imm12 << 0) | (P << 24) | (U << 23) | (W << 21);
-		else	// extra load / store
-			code.instructions[code.iCount] = (cond << 28) | opCode | (Rt << 12) | (Rn << 16) | ((imm12 & 0xf0) << 4) | (imm12 & 0xf) | (P << 24) | (U << 23) | (W << 21) | (1 << 22);
-		code.incInstructionNum();
+	private void createLSWordImm(Code32 code, int opCode, int cond, int Rt, int Rn, int imm, int P, int U, int W) {
+		switch (opCode) {
+		case armLdr: case armLdrb: case armStr: case armStrb:
+			if (imm > 0xfff) ErrorReporter.reporter.error(651); 
+			code.instructions[code.iCount] = (cond << 28) | opCode | (Rt << 12) | (Rn << 16) | (imm << 0) | (P << 24) | (U << 23) | (W << 21);
+			code.incInstructionNum();
+			break;
+		case armLdrsb: case armLdrsh: case armLdrh: case armStrh: // extra load / store
+			if (imm > 0xff) {
+				if (imm > 0xfff) ErrorReporter.reporter.error(651);
+				int baseOffset = imm / 256;
+				int off = imm % 256;
+				createDataProcImm(code, armAdd, cond, Rn, Rn, packImmediate(baseOffset * 256));
+				code.instructions[code.iCount] = (cond << 28) | opCode | (Rt << 12) | (Rn << 16) | ((off & 0xf0) << 4) | (off & 0xf) | (P << 24) | (U << 23) | (W << 21) | (1 << 22);
+				code.incInstructionNum();
+				createDataProcImm(code, armSub, cond, Rn, Rn, packImmediate(baseOffset * 256));
+			} else {
+				code.instructions[code.iCount] = (cond << 28) | opCode | (Rt << 12) | (Rn << 16) | ((imm & 0xf0) << 4) | (imm & 0xf) | (P << 24) | (U << 23) | (W << 21) | (1 << 22);
+				code.incInstructionNum();
+			}
+			break;
+		default:		
+			ErrorReporter.reporter.error(652); 
+		}
 	}
 
 	// ...(LDR, LDRB	:	(literal))
@@ -3333,6 +3353,7 @@ private void createFPdataProcImm(Code32 code, int opCode, int cond, int Vd, int
 		code.incInstructionNum();
 	}
 
+	// creates a pattern within the instruction stream, used for exception epilogue
 	private void createIpat(Code32 code, int pat) {
 		code.instructions[code.iCount] = pat;
 		code.incInstructionNum();

src/org/deepjava/launcher/Launcher.java

@@ -39,6 +39,7 @@
 import org.deepjava.classItems.Array;
 import org.deepjava.classItems.CFR;
 import org.deepjava.classItems.Class;
+import org.deepjava.classItems.Item;
 import org.deepjava.classItems.ICclassFileConsts;
 import org.deepjava.classItems.Method;
 import org.deepjava.config.Arch;
@@ -206,6 +207,15 @@ public static int buildAll(String deepProjectFileName, String targetConfiguratio
 						if (dbg) vrb.println("   is synthetic, omit");
 					} else {
 
+						if (dbg) {
+							vrb.println("\t\t\tclass fields");
+							Item it = clazz.instFields;
+							while (it != null && it != clazz.classFields) {
+								vrb.println("\t\t\t\t" + it.name + " " + it.offset);
+								it = it.next;
+							}
+						}
+						
 						// Create constant block
 						if (reporter.nofErrors <= 0) {
 							if(dbg) vrb.println("[LAUNCHER] creating constant block for " + clazz.name);