eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-23 00:24:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

WASM: fix exception handling. Use if instead of switch after call site when possible

Browse Source
This commit is contained in:
Alexey Andreev 2016-09-27 19:48:37 +03:00
parent 8a012178ed
commit cbd74d41f4
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/teavm/backend/wasm/WasmTarget.java
View File

@ -216,6 +216,10 @@ public class WasmTarget implements TeaVMTarget {
int.class), null).use(); int.class), null).use();
dependencyChecker.linkMethod(new MethodReference(WasmRuntime.class, "getStackRootPointer", Address.class, dependencyChecker.linkMethod(new MethodReference(WasmRuntime.class, "getStackRootPointer", Address.class,
Address.class), null).use(); Address.class), null).use();
dependencyChecker.linkMethod(new MethodReference(WasmRuntime.class, "setExceptionHandlerId", Address.class,
int.class, void.class), null).use();
dependencyChecker.linkMethod(new MethodReference(WasmRuntime.class, "getCallSiteId", Address.class,
int.class), null).use();
dependencyChecker.linkMethod(new MethodReference(Allocator.class, "allocate", dependencyChecker.linkMethod(new MethodReference(Allocator.class, "allocate",
RuntimeClass.class, Address.class), null).use(); RuntimeClass.class, Address.class), null).use();

21
core/src/main/java/org/teavm/model/lowlevel/ExceptionHandlingShadowStackContributor.java
View File

@ -32,6 +32,8 @@ import org.teavm.model.TryCatchBlock;
import org.teavm.model.TryCatchJoint; import org.teavm.model.TryCatchJoint;
import org.teavm.model.ValueType; import org.teavm.model.ValueType;
import org.teavm.model.Variable; import org.teavm.model.Variable;
import org.teavm.model.instructions.BinaryBranchingCondition;
import org.teavm.model.instructions.BinaryBranchingInstruction;
import org.teavm.model.instructions.CloneArrayInstruction; import org.teavm.model.instructions.CloneArrayInstruction;
import org.teavm.model.instructions.ConstructArrayInstruction; import org.teavm.model.instructions.ConstructArrayInstruction;
import org.teavm.model.instructions.ConstructInstruction; import org.teavm.model.instructions.ConstructInstruction;
@ -240,7 +242,6 @@ public class ExceptionHandlingShadowStackContributor {
SwitchInstruction switchInsn = new SwitchInstruction(); SwitchInstruction switchInsn = new SwitchInstruction();
switchInsn.setCondition(handlerIdVariable); switchInsn.setCondition(handlerIdVariable);
instructions.add(switchInsn);
if (next != null) { if (next != null) {
SwitchTableEntry continueExecutionEntry = new SwitchTableEntry(); SwitchTableEntry continueExecutionEntry = new SwitchTableEntry();
@ -280,6 +281,24 @@ public class ExceptionHandlingShadowStackContributor {
switchInsn.setDefaultTarget(getDefaultExceptionHandler()); switchInsn.setDefaultTarget(getDefaultExceptionHandler());
} }
if (switchInsn.getEntries().size() == 1) {
SwitchTableEntry entry = switchInsn.getEntries().get(0);
IntegerConstantInstruction singleTestConstant = new IntegerConstantInstruction();
singleTestConstant.setConstant(entry.getCondition());
singleTestConstant.setReceiver(program.createVariable());
instructions.add(singleTestConstant);
BinaryBranchingInstruction branching = new BinaryBranchingInstruction(BinaryBranchingCondition.EQUAL);
branching.setConsequent(entry.getTarget());
branching.setAlternative(switchInsn.getDefaultTarget());
branching.setFirstOperand(switchInsn.getCondition());
branching.setSecondOperand(singleTestConstant.getReceiver());
instructions.add(branching);
} else {
instructions.add(switchInsn);
}
return instructions; return instructions;
} }