azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not evaluate label instructions and such

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-06 13:52:39 +04:00
parent b926e79aac
commit 0aca17ce15
1 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/eval4j/interpreterLoop.kt
+45 -40
View File
@@ -67,58 +67,63 @@ fun interpreterLoop(
// skip to the next instruction // skip to the next instruction
} }
else -> when (insnOpcode) { else -> {
GOTO -> { when (insnOpcode) {
goto((currentInsn as JumpInsnNode).label) GOTO -> {
continue
}
RET -> {
val varNode = currentInsn as VarInsnNode
val address = frame.getLocal(varNode.`var`)
goto((address as LabelValue).value)
continue
}
// TODO: switch
LOOKUPSWITCH -> UnsupportedByteCodeException("LOOKUPSWITCH is not supported yet")
TABLESWITCH -> UnsupportedByteCodeException("TABLESWITCH is not supported yet")
IRETURN, LRETURN, FRETURN, DRETURN, ARETURN -> return ValueReturned(frame.getStack(0)!!)
RETURN -> return ValueReturned(VOID_VALUE)
IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IFNULL, IFNONNULL -> {
if (interpreter.checkUnaryCondition(frame.getStack(0)!!, insnOpcode)) {
goto((currentInsn as JumpInsnNode).label) goto((currentInsn as JumpInsnNode).label)
continue continue
} }
}
IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ, IF_ACMPNE -> { RET -> {
if (interpreter.checkBinaryCondition(frame.getStack(0)!!, frame.getStack(1)!!, insnOpcode)) { val varNode = currentInsn as VarInsnNode
goto((currentInsn as JumpInsnNode).label) val address = frame.getLocal(varNode.`var`)
goto((address as LabelValue).value)
continue continue
} }
// TODO: switch
LOOKUPSWITCH -> UnsupportedByteCodeException("LOOKUPSWITCH is not supported yet")
TABLESWITCH -> UnsupportedByteCodeException("TABLESWITCH is not supported yet")
IRETURN, LRETURN, FRETURN, DRETURN, ARETURN -> return ValueReturned(frame.getStack(0)!!)
RETURN -> return ValueReturned(VOID_VALUE)
IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IFNULL, IFNONNULL -> {
if (interpreter.checkUnaryCondition(frame.getStack(0)!!, insnOpcode)) {
goto((currentInsn as JumpInsnNode).label)
continue
}
}
IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ, IF_ACMPNE -> {
if (interpreter.checkBinaryCondition(frame.getStack(0)!!, frame.getStack(1)!!, insnOpcode)) {
goto((currentInsn as JumpInsnNode).label)
continue
}
}
// TODO: try/catch/finally
ATHROW -> {
val exceptionValue = frame.getStack(0)!!
val handled = handler.exceptionThrown(frame, currentInsn, exceptionValue)
if (handled != null) return handled
return ExceptionThrown(exceptionValue)
}
// Workaround for a bug in Kotlin: NoPatterMatched exception is thrown otherwise!
else -> {}
} }
// TODO: try/catch/finally try {
ATHROW -> { frame.execute(currentInsn, interpreter)
val exceptionValue = frame.getStack(0)!! }
val handled = handler.exceptionThrown(frame, currentInsn, exceptionValue) catch (e: ThrownFromEvalException) {
// TODO: try/catch.finaly
val handled = handler.exceptionThrown(frame, currentInsn, e.exception)
if (handled != null) return handled if (handled != null) return handled
return ExceptionThrown(exceptionValue) return ExceptionThrown(e.exception)
} }
} }
} }
try {
frame.execute(currentInsn, interpreter)
}
catch (e: ThrownFromEvalException) {
// TODO: try/catch.finaly
val handled = handler.exceptionThrown(frame, currentInsn, e.exception)
if (handled != null) return handled
return ExceptionThrown(e.exception)
}
val handled = handler.instructionProcessed(currentInsn) val handled = handler.instructionProcessed(currentInsn)
if (handled != null) return handled if (handled != null) return handled