package org.ibex.nestedvm;
import java.io.*;
+import java.util.Hashtable;
+
import org.ibex.nestedvm.util.*;
import org.apache.bcel.generic.*;
a(InstructionConstants.IUSHR);
int beg = text.addr >>> methodShift;
- int end = ((text.addr + text.size) >>> methodShift);
+ int end = ((text.addr + text.size + maxBytesPerMethod - 1) >>> methodShift);
// This data is redundant but BCEL wants it
- int[] matches = new int[end-beg+1];
- for(int i=beg;i<=end;i++) matches[i-beg] = i;
+ int[] matches = new int[end-beg];
+ for(int i=beg;i<end;i++) matches[i-beg] = i;
TABLESWITCH ts = new TABLESWITCH(matches,new InstructionHandle[matches.length],null);
a(ts);
- for(int n=beg;n<=end;n++){
+ for(int n=beg;n<end;n++){
InstructionHandle h = a(fac.createInvoke(fullClassName,"run_"+toHex(n<<methodShift),Type.VOID,Type.NO_ARGS,INVOKESPECIAL));
a(InstructionFactory.createBranchInstruction(GOTO,start));
ts.setTarget(n-beg,h);
a(fac.createCheckCast(new ObjectType("java.lang.Integer")));
a(fac.createInvoke("java.lang.Integer","intValue",Type.INT,Type.NO_ARGS,INVOKEVIRTUAL));
a(InstructionConstants.IRETURN);
- bh.setTarget(a(InstructionConstants.ICONST_M1));
- a(InstructionConstants.IRETURN);
+ bh.setTarget(a(InstructionConstants.POP));
+ a(InstructionConstants.ICONST_M1);
+ a(InstructionConstants.IRETURN);
lookupSymbol.setMaxLocals();
lookupSymbol.setMaxStack();
cl.addMethod(lookupSymbol.getMethod());
private InstructionHandle realStart;
private MethodGen curMethod;
- private boolean jumpable(int addr) { return jumpableAddresses.contains(new Integer(addr)); }
+ private boolean jumpable(int addr) { return jumpableAddresses.get(new Integer(addr)) != null; }
private void emitText(int addr, DataInputStream dis, int size) throws Exn,IOException {
if(textDone) throw new Exn("Multiple text segments");
pushConst(firstAddrOfNext);
setPC();
// mark the start of the next method as jumpable
- jumpableAddresses.add(new Integer(firstAddrOfNext));
+ jumpableAddresses.put(new Integer(firstAddrOfNext),Boolean.TRUE);
}
insnList.move(returnHandle,insnList.getEnd());
//System.err.println("Delay slot is jumpable - This code is untested + " + toHex(nextInsn));
if(pc+4==endOfMethod) {
// the delay slot is at the start of the next method
- jumpableAddresses.add(new Integer(pc+8)); // make the 2nd insn of the next method jumpable
+ jumpableAddresses.put(new Integer(pc+8),Boolean.TRUE); // make the 2nd insn of the next method jumpable
branch(pc,pc+8); // jump over it
//System.err.println("delay slot: " + toHex(pc+8));
unreachable = true;
pushRegZ(R+A1);
pushRegZ(R+A2);
pushRegZ(R+A3);
- a(fac.createInvoke(fullClassName,"syscall",Type.INT,new Type[]{Type.INT,Type.INT,Type.INT,Type.INT,Type.INT},INVOKEVIRTUAL));
+ pushRegZ(R+T0);
+ pushRegZ(R+T1);
+ a(fac.createInvoke(fullClassName,"syscall",Type.INT,new Type[]{Type.INT,Type.INT,Type.INT,Type.INT,Type.INT,Type.INT,Type.INT},INVOKEVIRTUAL));
setReg();
a(InstructionConstants.ALOAD_0);
break;
case 1: // SUB.X
preSetDouble(F+fd,d);
- pushDouble(F+ft,d);
pushDouble(F+fs,d);
+ pushDouble(F+ft,d);
a(d ? InstructionConstants.DSUB : InstructionConstants.FSUB);
- setDouble(d);
+ setDouble(d);
break;
case 2: // MUL.X
preSetDouble(F+fd,d);
b1 = a(InstructionFactory.createBranchInstruction(IFGT,null));
a(d ? InstructionConstants.DCONST_0 : InstructionConstants.FCONST_0);
- if(d) {
- a(InstructionConstants.DUP2_X2);
- a(InstructionConstants.POP2);
- } else {
- a(InstructionConstants.POP);
- }
- a(InstructionConstants.DSUB);
+ a(d ? InstructionConstants.DSUB : InstructionConstants.FSUB);
b1.setTarget(setDouble(d));
pushReg(F+fs);
setReg();
- preSetReg(F+fd+1);
- pushReg(F+fs+1);
- setReg();
+ if(d) {
+ preSetReg(F+fd+1);
+ pushReg(F+fs+1);
+ setReg();
+ }
break;
case 7: // NEG.X
preSetDouble(F+fd,d);
pushDouble(F+fs,d);
a(d ? InstructionConstants.DNEG : InstructionConstants.FNEG);
- setDouble(d);
+ setDouble(d);
break;
case 32: // CVT.S.X
preSetFloat(F+fd);
- pushDouble(F+fd,d);
+ pushDouble(F+fs,d);
if(d) a(InstructionConstants.D2F);
setFloat();
break;
case 33: // CVT.D.X
preSetDouble(F+fd);
- pushDouble(F+fd,d);
+ pushDouble(F+fs,d);
if(!d) a(InstructionConstants.F2D);
setDouble();
break;
case 62: b1 = a(InstructionFactory.createBranchInstruction(IFLE,null)); break;
default: b1 = null;
}
-
+ // FIXME: We probably don't need to pushConst(0x00000)
pushConst(0x000000);
b2 = a(InstructionFactory.createBranchInstruction(GOTO,null));
b1.setTarget(pushConst(0x800000));
}
}
- private String regField(int reg) {
- String field;
+ private static final String[] regField = {
+ "r0","r1","r2","r3","r4","r5","r6","r7",
+ "r8","r9","r10","r11","r12","r13","r14","r15",
+ "r16","r17","r18","r19","r20","r21","r22","r23",
+ "r24","r25","r26","r27","r28","r29","r30","r31",
+
+ "f0","f1","f2","f3","f4","f5","f6","f7",
+ "f8","f9","f10","f11","f12","f13","f14","f15",
+ "f16","f17","f18","f19","f20","f21","f22","f23",
+ "f24","f25","f26","f27","f28","f29","f30","f31",
+
+ "hi","lo","fcsr"
+ };
+
+ private static String regField(int reg) {
+ return regField[reg];
+
+ /*String field;
switch(reg) {
case HI: field = "hi"; break;
case LO: field = "lo"; break;
case FCSR: field = "fcsr"; break;
default:
- if(reg > R && reg < R+32) field="r"+(reg-R);
- else if(reg >= F && reg < F+32) field="f"+(reg-F);
+ if(reg > R && reg < R+32) regFieldR[reg-R];
+ else if(reg >= F && reg < F+32) return regFieldF[
else throw new IllegalArgumentException(""+reg);
}
- return field;
+ return field;*/
}
private boolean doLocal(int reg) {
return h;
}
+ private Hashtable intCache = new Hashtable();
+
private InstructionHandle pushConst(int n) {
- if(n >= 0 && n <= 5) {
+ if(n >= -1 && n <= 5) {
switch(n) {
+ case -1: return a(InstructionConstants.ICONST_M1);
case 0: return a(InstructionConstants.ICONST_0);
case 1: return a(InstructionConstants.ICONST_1);
case 2: return a(InstructionConstants.ICONST_2);
case 5: return a(InstructionConstants.ICONST_5);
default: return null;
}
- } else if(n == -1) {
- return a(InstructionConstants.ICONST_M1);
} else if(n >= -128 && n <= 127) {
return a(new BIPUSH((byte) n));
} else if(n >= -32768 && n <= 32767) {