GabrielTofvesson/Beethoven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement removal of extraneous (injected) GOTO instructions

Browse Source
This commit is contained in:
Gabriel Tofvesson 2021-02-05 15:11:46 +01:00
parent a13c241f47
commit a1bda63564
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/dev/w1zzrd/asm/Combine.java
View File

@ -379,8 +379,13 @@ public class Combine {
} }
private void storeAndGotoFromReturn(MethodNode source, InsnList nodes, int storeIndex, MethodSignature sig) { private void storeAndGotoFromReturn(MethodNode source, InsnList nodes, int storeIndex, MethodSignature sig) {
// The last (injected) GOTO can always be removed
AbstractInsnNode lastGoto = null;
int jumpCount = 0;
// If we already have a final frame, there's no need to add one // If we already have a final frame, there's no need to add one
LabelNode endLabel = hasEndJumpFrame(nodes) ? findOrMakeEndLabel(nodes) : makeEndJumpFrame(nodes, sig, source); boolean hadEJF = hasEndJumpFrame(nodes);
LabelNode endLabel = hadEJF ? findOrMakeEndLabel(nodes) : makeEndJumpFrame(nodes, sig, source);
INSTRUCTION_LOOP: INSTRUCTION_LOOP:
for (AbstractInsnNode current = nodes.getFirst(); current != null; current = current.getNext()) { for (AbstractInsnNode current = nodes.getFirst(); current != null; current = current.getNext()) {
@ -406,19 +411,33 @@ public class Combine {
break; break;
case Opcodes.RETURN: case Opcodes.RETURN:
nodes.set(current, current = new JumpInsnNode(Opcodes.GOTO, endLabel)); nodes.set(current, lastGoto = current = new JumpInsnNode(Opcodes.GOTO, endLabel));
++jumpCount;
// Fallthrough // Fallthrough
default: default:
continue INSTRUCTION_LOOP; continue INSTRUCTION_LOOP;
} }
nodes.insert(current, current = new JumpInsnNode(Opcodes.GOTO, endLabel)); nodes.insert(current, lastGoto = current = new JumpInsnNode(Opcodes.GOTO, endLabel));
++jumpCount;
}
if (lastGoto != null) {
nodes.remove(lastGoto);
// The final jump frame and label can be removed
if (jumpCount == 1 && !hadEJF)
nodes.remove(endLabel.getNext());
} }
} }
private void popAndGotoFromReturn(MethodNode source, InsnList nodes, MethodSignature sig) { private void popAndGotoFromReturn(MethodNode source, InsnList nodes, MethodSignature sig) {
AbstractInsnNode lastGoto = null;
int jumpCount = 0;
// If we already have a final frame, there's no need to add one // If we already have a final frame, there's no need to add one
LabelNode endLabel = hasEndJumpFrame(nodes) ? findOrMakeEndLabel(nodes) : makeEndJumpFrame(nodes, sig, source); boolean hadEJF = hasEndJumpFrame(nodes);
LabelNode endLabel = hadEJF ? findOrMakeEndLabel(nodes) : makeEndJumpFrame(nodes, sig, source);
INSTRUCTION_LOOP: INSTRUCTION_LOOP:
for (AbstractInsnNode current = nodes.getFirst(); current != null; current = current.getNext()) { for (AbstractInsnNode current = nodes.getFirst(); current != null; current = current.getNext()) {
@ -435,14 +454,25 @@ public class Combine {
break; break;
case Opcodes.RETURN: case Opcodes.RETURN:
nodes.set(current, current = new JumpInsnNode(Opcodes.GOTO, endLabel)); nodes.set(current, lastGoto = current = new JumpInsnNode(Opcodes.GOTO, endLabel));
++jumpCount;
// Fallthrough // Fallthrough
default: default:
continue INSTRUCTION_LOOP; continue INSTRUCTION_LOOP;
} }
nodes.insert(current, current = new JumpInsnNode(Opcodes.GOTO, endLabel)); nodes.insert(current, lastGoto = current = new JumpInsnNode(Opcodes.GOTO, endLabel));
++jumpCount;
}
if (lastGoto != null) {
nodes.remove(lastGoto);
// The final jump frame and label can be removed
if (jumpCount == 1 && !hadEJF)
nodes.remove(endLabel.getNext());
} }
} }