if(!pruneCases) throw new Exn("-o prunecases MUST be enabled for ClassFileCompiler");
// Class
- cl = new ClassGen(fullClassName,runtimeClass,source,ACC_SUPER|ACC_PUBLIC,null);
+ cl = new ClassGen(fullClassName,runtimeClass,source,ACC_SUPER|ACC_PUBLIC|ACC_FINAL,null);
cp = cl.getConstantPool();
fac = new InstructionFactory(cl,cp);
throw new Exn("Generation of the trampoline method failed. Try increasing maxInsnPerMethod");
}
+ addConstReturnMethod("gp",gp.addr);
+ addConstReturnMethod("entryPoint",elf.header.entry);
+ addConstReturnMethod("heapStart",highestAddr);
+
+ if(userInfo != null) {
+ addConstReturnMethod("userInfoBase",userInfo.addr);
+ addConstReturnMethod("userInfoSize",userInfo.size);
+ }
+
+ // FEATURE: Allow specification of memory size at runtime (numpages)
+ // Constructor
MethodGen init = newMethod(ACC_PUBLIC,Type.VOID, Type.NO_ARGS, "<init>");
selectMethod(init);
- // Constructor
a(InstructionConstants.ALOAD_0);
pushConst(pageSize);
pushConst(totalPages);
- pushConst(fastMem ? 0 : 1);
- a(fac.createInvoke(runtimeClass,"<init>",Type.VOID,new Type[]{Type.INT,Type.INT,Type.BOOLEAN},INVOKESPECIAL));
- a(InstructionConstants.ALOAD_0);
- pushConst(gp.addr);
- a(fac.createFieldAccess(fullClassName,"gp",Type.INT, PUTFIELD));
-
- a(InstructionConstants.ALOAD_0);
- pushConst(elf.header.entry);
- a(fac.createFieldAccess(fullClassName,"entryPoint",Type.INT, PUTFIELD));
-
- a(InstructionConstants.ALOAD_0);
- pushConst(onePage ? ((highestAddr+4095)&~4095) : ((highestAddr+pageSize-1)&~(pageSize-1)));
- a(fac.createFieldAccess(fullClassName,"brkAddr",Type.INT, PUTFIELD));
+ a(fac.createInvoke(runtimeClass,"<init>",Type.VOID,new Type[]{Type.INT,Type.INT},INVOKESPECIAL));
- if(userInfo != null) {
- a(InstructionConstants.ALOAD_0);
- pushConst(userInfo.addr);
- a(fac.createFieldAccess(fullClassName,"userInfoBase",Type.INT, PUTFIELD));
- a(InstructionConstants.ALOAD_0);
- pushConst(userInfo.size);
- a(fac.createFieldAccess(fullClassName,"userInfoSize",Type.INT, PUTFIELD));
- }
a(initExtras);
- a(InstructionConstants.ALOAD_0);
- pushConst(Runtime.INITIALIZED);
- a(fac.createFieldAccess(fullClassName,"state",Type.INT, PUTFIELD));
+
a(InstructionConstants.RETURN);
+
init.setMaxLocals();
init.setMaxStack();
cl.addMethod(init.getMethod());
+
MethodGen clinit = newMethod(ACC_PRIVATE|ACC_STATIC,Type.VOID, Type.NO_ARGS, "<clinit>");
selectMethod(clinit);
a(clinitExtras);
a(InstructionConstants.ALOAD_1);
a(fac.createFieldAccess("org.ibex.nestedvm.Runtime$CPUState","pc",Type.INT,GETFIELD));
a(fac.createFieldAccess(fullClassName,"pc",Type.INT, PUTFIELD));
+
a(InstructionConstants.RETURN);
setCPUState.setMaxLocals();
setCPUState.setMaxStack();
cl.addMethod(setCPUState.getMethod());
- MethodGen getCPUState = newMethod(ACC_PROTECTED,Type.getType("Lorg/ibex/nestedvm/Runtime$CPUState;"),Type.NO_ARGS,"getCPUState");
+ MethodGen getCPUState = newMethod(ACC_PROTECTED,Type.VOID,new Type[]{Type.getType("Lorg/ibex/nestedvm/Runtime$CPUState;")},"getCPUState");
selectMethod(getCPUState);
- a(fac.createNew("org.ibex.nestedvm.Runtime$CPUState"));
- a(InstructionConstants.DUP);
- a(fac.createInvoke("org.ibex.nestedvm.Runtime$CPUState","<init>",Type.VOID,Type.NO_ARGS,INVOKESPECIAL));
- a(InstructionConstants.ASTORE_1);
-
a(InstructionConstants.ALOAD_1);
a(fac.createFieldAccess("org.ibex.nestedvm.Runtime$CPUState","r",new ArrayType(Type.INT,1),GETFIELD));
a(InstructionConstants.ASTORE_2);
a(fac.createFieldAccess(fullClassName,"pc",Type.INT, GETFIELD));
a(fac.createFieldAccess("org.ibex.nestedvm.Runtime$CPUState","pc",Type.INT,PUTFIELD));
- a(InstructionConstants.ALOAD_1);
- a(InstructionConstants.ARETURN);
+ a(InstructionConstants.RETURN);
getCPUState.setMaxLocals();
getCPUState.setMaxStack();
cl.addMethod(getCPUState.getMethod());
MethodGen execute = newMethod(ACC_PROTECTED,Type.VOID,Type.NO_ARGS,"_execute");
selectMethod(execute);
- a(InstructionConstants.ALOAD_0);
- a(fac.createInvoke(fullClassName,"trampoline",Type.VOID,Type.NO_ARGS,INVOKESPECIAL));
+ InstructionHandle tryStart = a(InstructionConstants.ALOAD_0);
+ InstructionHandle tryEnd = a(fac.createInvoke(fullClassName,"trampoline",Type.VOID,Type.NO_ARGS,INVOKESPECIAL));
a(InstructionConstants.RETURN);
+
+ InstructionHandle catchInsn = a(InstructionConstants.ASTORE_1);
+ a(fac.createNew("org.ibex.nestedvm.Runtime$FaultException"));
+ a(InstructionConstants.DUP);
+ a(InstructionConstants.ALOAD_1);
+ a(fac.createInvoke("org.ibex.nestedvm.Runtime$FaultException","<init>",Type.VOID,new Type[]{new ObjectType("java.lang.RuntimeException")},INVOKESPECIAL));
+ a(InstructionConstants.ATHROW);
+
+ execute.addExceptionHandler(tryStart,tryEnd,catchInsn,new ObjectType("java.lang.RuntimeException"));
execute.setMaxLocals();
execute.setMaxStack();
cl.addMethod(execute.getMethod());
a(fac.createInvoke(fullClassName,"<init>",Type.VOID,Type.NO_ARGS,INVOKESPECIAL));
a(new PUSH(cp,fullClassName));
a(InstructionConstants.ALOAD_0);
- a(fac.createInvoke(fullClassName,"run",Type.INT,new Type[]{Type.STRING,new ArrayType(Type.STRING,1)},INVOKEVIRTUAL));
+ if(unixRuntime)
+ a(fac.createInvoke("org.ibex.nestedvm.UnixRuntime","runAndExec",Type.INT,
+ new Type[]{Type.getType("Lorg/ibex/nestedvm/UnixRuntime;"),Type.STRING,new ArrayType(Type.STRING,1)},
+ INVOKESTATIC));
+ else
+ a(fac.createInvoke(fullClassName,"run",Type.INT,new Type[]{Type.STRING,new ArrayType(Type.STRING,1)},INVOKEVIRTUAL));
a(fac.createInvoke("java.lang.System","exit",Type.VOID,new Type[]{Type.INT},INVOKESTATIC));
a(InstructionConstants.RETURN);
main.setMaxLocals();
main.setMaxStack();
cl.addMethod(main.getMethod());
+ if(printStats)
+ System.out.println("Constant Pool Size: " + cp.getSize());
cl.getJavaClass().dump(os);
}
+
+ private void addConstReturnMethod(String name, int val) {
+ MethodGen method = newMethod(ACC_PROTECTED,Type.INT, Type.NO_ARGS,name);
+ selectMethod(method);
+ pushConst(val);
+ a(InstructionConstants.IRETURN);
+ method.setMaxLocals();
+ method.setMaxStack();
+ cl.addMethod(method.getMethod());
+ }
private static int initDataCount;
private void emitData(int addr, DataInputStream dis, int size, boolean readOnly) throws Exn,IOException {
if(pc == -1) throw new Exn("pc modifying insn in delay slot");
int target = (pc&0xf0000000)|(jumpTarget << 2);
emitInstruction(-1,nextInsn,-1);
- if(optimizedMemcpy && (target == memcpy || target == memset)) {
- a(InstructionConstants.ALOAD_0);
- pushRegZ(R+4);
- pushRegZ(R+5);
- pushRegZ(R+6);
- a(fac.createInvoke(fullClassName,target==memcpy ? "memcpy" : "memset", Type.VOID, new Type[]{Type.INT,Type.INT,Type.INT},INVOKEVIRTUAL));
- preSetReg(R+2);
- pushReg(R+4);
- setReg();
- branch(pc,pc+8);
- } else {
- preSetReg(R+RA);
- pushConst(pc+8);
- setReg();
- branch(pc, target);
- }
+ preSetReg(R+RA);
+ pushConst(pc+8);
+ setReg();
+ branch(pc, target);
unreachable = true;
break;
}
a(InstructionConstants.I2L);
pushConst(0xffffffffL);
a(InstructionConstants.LAND);
- pushConst((long)unsignedImmediate);
+ pushConst((long)signedImmediate);
a(InstructionConstants.LCMP);
b1 = a(InstructionFactory.createBranchInstruction(IFLT,null));
memWrite();
break;
}
- // FEATURE: This need to be atomic if we ever support threads (see SWC0/SC)
+ // This need to be atomic if we ever support threads (see SWC0/SC)
case 48: // LWC0/LL
preSetReg(R+rt);
memRead(R+rs,signedImmediate);
setReg();
break;
- /* FEATURE: This needs to fail (set rt to 0) if the memory location was modified
+ /* This needs to fail (set rt to 0) if the memory location was modified
* between the LL and SC if we every support threads.
*/
case 56: // SWC0/SC
projects / nestedvm.git / blobdiff