From c4061125c45aa6e339f9387bb35fcaade71bb865 Mon Sep 17 00:00:00 2001 From: i22007 Date: Tue, 14 May 2024 11:39:14 +0200 Subject: [PATCH 1/2] Add method parameters to bytecode --- src/main/java/ast/parameter/ParameterListNode.java | 2 +- src/main/java/bytecode/Mapper.java | 10 ++++++++-- src/main/java/bytecode/MethodCodeGen.java | 8 +++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/ast/parameter/ParameterListNode.java b/src/main/java/ast/parameter/ParameterListNode.java index 34c615a..f409a65 100644 --- a/src/main/java/ast/parameter/ParameterListNode.java +++ b/src/main/java/ast/parameter/ParameterListNode.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; public class ParameterListNode extends ASTNode { - List parameters = new ArrayList<>(); + public List parameters = new ArrayList<>(); public ParameterListNode(List parameters){ this.parameters = parameters; diff --git a/src/main/java/bytecode/Mapper.java b/src/main/java/bytecode/Mapper.java index 7f1b219..dbc452e 100644 --- a/src/main/java/bytecode/Mapper.java +++ b/src/main/java/bytecode/Mapper.java @@ -1,5 +1,7 @@ package bytecode; +import ast.parameter.ParameterListNode; +import ast.parameter.ParameterNode; import ast.type.AccessTypeNode; import ast.type.EnumAccessTypeNode; import ast.type.EnumTypeNode; @@ -17,8 +19,12 @@ public class Mapper { return 0; } - public String generateMethodDescriptor(TypeNode typeNode) { - String descriptor = "()"; + public String generateMethodDescriptor(TypeNode typeNode, ParameterListNode parameterListNode) { + String descriptor = "("; + for(ParameterNode parameterNode : parameterListNode.parameters) { + descriptor += getTypeChar(parameterNode.type.enumTypeNode); + } + descriptor += ")"; descriptor += getTypeChar(typeNode.enumTypeNode); return descriptor; } diff --git a/src/main/java/bytecode/MethodCodeGen.java b/src/main/java/bytecode/MethodCodeGen.java index fd8a29a..2e352be 100644 --- a/src/main/java/bytecode/MethodCodeGen.java +++ b/src/main/java/bytecode/MethodCodeGen.java @@ -9,6 +9,7 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { private ClassWriter classWriter; Mapper mapper = new Mapper(); + private MethodVisitor methodVisitor; public MethodCodeGen(ClassWriter classWriter) { this.classWriter = classWriter; @@ -27,12 +28,13 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { @Override public void visit(MethodNode methodNode) { - MethodVisitor method = classWriter.visitMethod(mapper.mapAccesTypeToOpcode(methodNode.visibility), + methodVisitor = classWriter.visitMethod(mapper.mapAccesTypeToOpcode(methodNode.visibility), methodNode.identifier, - mapper.generateMethodDescriptor(methodNode.type), + mapper.generateMethodDescriptor(methodNode.type, methodNode.parameters), null, null); - method.visitEnd(); + // methodNode.parameters.accept(this); + methodVisitor.visitEnd(); } } From b7d5a5c6254ce1d3e1c514ce67de81327ab65755 Mon Sep 17 00:00:00 2001 From: i22007 Date: Tue, 14 May 2024 15:26:05 +0200 Subject: [PATCH 2/2] Fixed empty class code gen --- .../java/ast/parameter/ParameterListNode.java | 2 +- src/main/java/bytecode/ClassCodeGen.java | 13 +++- src/main/java/bytecode/FieldCodeGen.java | 13 ---- src/main/java/bytecode/Mapper.java | 12 ++- src/main/java/bytecode/MethodCodeGen.java | 75 +++++++++++++++++-- 5 files changed, 86 insertions(+), 29 deletions(-) delete mode 100644 src/main/java/bytecode/FieldCodeGen.java diff --git a/src/main/java/ast/parameter/ParameterListNode.java b/src/main/java/ast/parameter/ParameterListNode.java index 69d12f3..ff1c58d 100644 --- a/src/main/java/ast/parameter/ParameterListNode.java +++ b/src/main/java/ast/parameter/ParameterListNode.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; public class ParameterListNode implements ASTNode { - List parameters = new ArrayList<>(); + public List parameters = new ArrayList<>(); public ParameterListNode(List parameters){ this.parameters = parameters; diff --git a/src/main/java/bytecode/ClassCodeGen.java b/src/main/java/bytecode/ClassCodeGen.java index 7a1c0f0..b0afa69 100644 --- a/src/main/java/bytecode/ClassCodeGen.java +++ b/src/main/java/bytecode/ClassCodeGen.java @@ -13,14 +13,19 @@ import org.objectweb.asm.Opcodes; import java.io.FileOutputStream; import java.io.IOException; + public class ClassCodeGen implements ClassVisitor { - Mapper mapper = new Mapper(); - ClassWriter classWriter; + private Mapper mapper; + private ClassWriter classWriter; + + public ClassCodeGen() { + mapper = new Mapper(); + } @Override public void visit(ClassNode classNode) { classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); - classWriter.visit(Opcodes.V1_8, mapper.mapAccesTypeToOpcode(classNode.accessType), classNode.identifier, null, + classWriter.visit(Opcodes.V1_5, mapper.mapAccessTypeToOpcode(classNode.accessType), classNode.identifier, null, "java/lang/Object", null); for (MemberNode memberNode : classNode.members) { @@ -41,7 +46,7 @@ public class ClassCodeGen implements ClassVisitor { @Override public void visit(FieldNode fieldNode) { if(fieldNode.type instanceof BaseTypeNode baseTypeNode){ - classWriter.visitField(mapper.mapAccesTypeToOpcode(fieldNode.accessTypeNode), fieldNode.identifier, mapper.getTypeChar(baseTypeNode.enumType), null, null ); + classWriter.visitField(mapper.mapAccessTypeToOpcode(fieldNode.accessTypeNode), fieldNode.identifier, mapper.getTypeChar(baseTypeNode.enumType), null, null ); } classWriter.visitEnd(); } diff --git a/src/main/java/bytecode/FieldCodeGen.java b/src/main/java/bytecode/FieldCodeGen.java deleted file mode 100644 index abbda43..0000000 --- a/src/main/java/bytecode/FieldCodeGen.java +++ /dev/null @@ -1,13 +0,0 @@ -package bytecode; - -import ast.member.FieldNode; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.FieldVisitor; - -public class FieldCodeGen { - - public void generateFieldCode(ClassWriter classWriter, FieldNode fieldNode) { - Mapper mapper = new Mapper(); - FieldVisitor fieldVisitor = classWriter.visitField(mapper.mapAccesTypeToOpcode(fieldNode.accessTypeNode), fieldNode.identifier, "", null, null); - } -} diff --git a/src/main/java/bytecode/Mapper.java b/src/main/java/bytecode/Mapper.java index fb4f484..4bc1e7c 100644 --- a/src/main/java/bytecode/Mapper.java +++ b/src/main/java/bytecode/Mapper.java @@ -1,10 +1,12 @@ package bytecode; +import ast.parameter.ParameterListNode; +import ast.parameter.ParameterNode; import ast.type.*; import org.objectweb.asm.Opcodes; public class Mapper { - public int mapAccesTypeToOpcode(AccessTypeNode type) { + public int mapAccessTypeToOpcode(AccessTypeNode type) { switch (type.enumAccessTypeNode) { case EnumAccessTypeNode.PUBLIC: return Opcodes.ACC_PUBLIC; @@ -14,8 +16,12 @@ public class Mapper { return 0; } - public String generateMethodDescriptor(BaseTypeNode baseTypeNode) { - String descriptor = "()"; + public String generateMethodDescriptor(BaseTypeNode baseTypeNode, ParameterListNode parameterListNode) { + String descriptor = "("; + for(ParameterNode parameterNode : parameterListNode.parameters) { + descriptor += getTypeChar(EnumTypeNode.INT); + } + descriptor += ")"; descriptor += getTypeChar(baseTypeNode.enumType); return descriptor; } diff --git a/src/main/java/bytecode/MethodCodeGen.java b/src/main/java/bytecode/MethodCodeGen.java index c8a38f3..a4249f1 100644 --- a/src/main/java/bytecode/MethodCodeGen.java +++ b/src/main/java/bytecode/MethodCodeGen.java @@ -2,40 +2,99 @@ package bytecode; import ast.member.ConstructorNode; import ast.member.MethodNode; +import ast.parameter.ParameterListNode; +import ast.parameter.ParameterNode; import ast.type.BaseTypeNode; +import ast.type.EnumTypeNode; import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; + +import java.util.ArrayList; +import java.util.List; + +import static org.objectweb.asm.Opcodes.*; + public class MethodCodeGen implements bytecode.visitor.MethodVisitor { private ClassWriter classWriter; - Mapper mapper = new Mapper(); + private Mapper mapper; private MethodVisitor methodVisitor; + private List localVaribales; + public MethodCodeGen(ClassWriter classWriter) { this.classWriter = classWriter; + mapper = new Mapper(); + localVaribales = new ArrayList<>(); } @Override public void visit(ConstructorNode constructorNode) { - MethodVisitor constructor = - classWriter.visitMethod(mapper.mapAccesTypeToOpcode(constructorNode.visibility), + methodVisitor = + classWriter.visitMethod(mapper.mapAccessTypeToOpcode(constructorNode.visibility), "", "()V", null, null); - constructor.visitEnd(); + methodVisitor.visitCode(); + methodVisitor.visitVarInsn(ALOAD, 0); + methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V", false); + methodVisitor.visitInsn(RETURN); + methodVisitor.visitMaxs(1, 1); + methodVisitor.visitEnd(); } @Override public void visit(MethodNode methodNode) { - if(methodNode.type instanceof BaseTypeNode baseTypeNode){ - MethodVisitor method = classWriter.visitMethod(mapper.mapAccesTypeToOpcode(methodNode.visibility), + if (methodNode.type instanceof BaseTypeNode baseTypeNode) { + methodVisitor = classWriter.visitMethod(mapper.mapAccessTypeToOpcode(methodNode.visibility), methodNode.identifier, - mapper.generateMethodDescriptor(baseTypeNode), + mapper.generateMethodDescriptor(baseTypeNode, methodNode.parameters), null, null); - method.visitEnd(); + + methodVisitor.visitCode(); + localVaribales.add("this"); + for (ParameterNode parameterNode : methodNode.parameters.parameters) { + localVaribales.add(parameterNode.identifier); + } + + //test(); + methodVisitor.visitMaxs(1, localVaribales.size()); + methodVisitor.visitEnd(); } } + + public void test() { + Label start = new Label(); + Label loop = new Label(); + Label end = new Label(); + methodVisitor.visitLabel(start); + //methodVisitor.visitVarInsn(Opcodes.ICONST_M1, 99); + //methodVisitor.visitInsn(Opcodes.ICONST_5); + methodVisitor.visitLdcInsn(99); + // methodVisitor.visitInsn(Opcodes.ICONST_0); + //methodVisitor.visitVarInsn(Opcodes.ILOAD, 2); + methodVisitor.visitVarInsn(Opcodes.ISTORE, 1); + methodVisitor.visitLabel(loop); + methodVisitor.visitVarInsn(Opcodes.ILOAD, 1); + methodVisitor.visitInsn(Opcodes.ICONST_5); + methodVisitor.visitJumpInsn(Opcodes.IF_ICMPGE, end); + methodVisitor.visitFieldInsn(Opcodes.GETSTATIC, + "java/lang/System", "out", + "Ljava/io/PrintStream;"); + methodVisitor.visitLdcInsn("Bytecode"); + methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, + "java/io/PrintStream", "println", + "(Ljava/lang/String;)V", false); + methodVisitor.visitIincInsn(1, 1); + methodVisitor.visitJumpInsn(Opcodes.GOTO, loop); + methodVisitor.visitLabel(end); + methodVisitor.visitVarInsn(Opcodes.ILOAD, 1); + methodVisitor.visitInsn(Opcodes.IRETURN); + methodVisitor.visitEnd(); + } }