impr: add line number instructions

jumanji144 · Apr 15, 2024 · b6a4fd6 · b6a4fd6
1 parent 7da0d13
commit b6a4fd6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/InstructionPrinter.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/InstructionPrinter.java
@@ -48,7 +48,11 @@ public void index(int index) {
 
     @Override
     public void label(Label label) {
-        ctx.label(labelNames.get(label.getIndex())).next();
+        String name = labelNames.get(label.getIndex());
+        ctx.label(name).next();
+        if(label.getLineNumber() != Label.UNSET) {
+            ctx.instruction("line").print(name).arg().print(Integer.toString(label.getLineNumber())).next();
+        }
     }
 
     @Override
@@ -218,7 +222,7 @@ public void execute(ConditionalJumpInstruction instruction) {
 
     @Override
     public void execute(VariableIncrementInstruction instruction) {
-        ctx.instruction(OPCODES[instruction.opcode()]).arg()
+        ctx.instruction(OPCODES[instruction.opcode()])
                 .literal(names.getName(instruction.variableIndex(), currentIndex + 1)).arg()
                 .literal(Integer.toString(instruction.incrementBy())).next();
     }

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/util/BlwOpcodes.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/util/BlwOpcodes.java
@@ -30,6 +30,7 @@ public static int opcode(String name) {
                 throw new ExceptionInInitializerError(e);
             }
         }
+        opcodes.put("line", -1);
     }
 
 }
diff --git a/jasm-core/src/main/java/me/darknet/assembler/ast/specific/ASTMethod.java b/jasm-core/src/main/java/me/darknet/assembler/ast/specific/ASTMethod.java
@@ -74,7 +74,8 @@ public void accept(ErrorCollector collector, ASTMethodVisitor visitor) {
                 if (instruction instanceof ASTLabel lab) {
                     instructionVisitor.visitLabel(lab.identifier());
                 } else {
-                    instructionVisitor.visitInstruction(instruction);
+                    if (!instruction.identifier().content().equals("line"))
+                        instructionVisitor.visitInstruction(instruction);
                     localIrInstructions.get(instructionIndex++).transform(instruction, instructionVisitor);
                 }
             }

diff --git a/jasm-core/src/main/java/me/darknet/assembler/visitor/ASTInstructionVisitor.java b/jasm-core/src/main/java/me/darknet/assembler/visitor/ASTInstructionVisitor.java
@@ -2,6 +2,7 @@
 
 import me.darknet.assembler.ast.primitive.ASTIdentifier;
 import me.darknet.assembler.ast.primitive.ASTInstruction;
+import me.darknet.assembler.ast.primitive.ASTNumber;
 import org.jetbrains.annotations.NotNull;
 
 public interface ASTInstructionVisitor {
@@ -22,6 +23,16 @@ public interface ASTInstructionVisitor {
      */
     void visitLabel(@NotNull ASTIdentifier label);
 
+    /**
+     * Visit a line number
+     *
+     * @param label
+     *              the label
+     * @param line
+     *              the line number
+     */
+    void visitLineNumber(ASTIdentifier label, ASTNumber line);
+
     void visitException(@NotNull ASTIdentifier start, @NotNull ASTIdentifier end, @NotNull ASTIdentifier handler, @NotNull ASTIdentifier type);
 
     void visitEnd();

diff --git a/jasm-core/src/main/java/me/darknet/assembler/visitor/ASTJvmInstructionVisitor.java b/jasm-core/src/main/java/me/darknet/assembler/visitor/ASTJvmInstructionVisitor.java
@@ -175,14 +175,4 @@ public interface ASTJvmInstructionVisitor extends ASTInstructionVisitor {
      */
     void visitMultiANewArrayInsn(ASTIdentifier descriptor, ASTNumber numDimensions);
 
-    /**
-     * Visit a line number
-     *
-     * @param label
-     *              the label
-     * @param line
-     *              the line number
-     */
-    void visitLineNumber(ASTIdentifier label, ASTNumber line);
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ public static int opcode(String name) { @@
                     throw new ExceptionInInitializerError(e);
                 }
             }
+            opcodes.put("line", -1);
         }
     }