Completed jasmin array access (non-initialization)

isabel-amaral · isabel-amaral · commit 0dcc7687ce1c · 2023-05-19T13:33:31.000+01:00
diff --git a/src/main/pt/up/fe/comp2023/jasmin/JVMInstructionUtils.java b/src/main/pt/up/fe/comp2023/jasmin/JVMInstructionUtils.java
@@ -195,7 +195,12 @@ public static String createBinaryOpInstruction(BinaryOpInstruction instruction,
     }
 
     public static String createNoperInstruction(SingleOpInstruction instruction, HashMap<String, Descriptor> varTable) {
-        return getLoadInstruction(instruction.getSingleOperand(), varTable);
+        Element operand = instruction.getSingleOperand();
+        if (operand instanceof ArrayOperand) {
+            return getArrayLoadInstruction((ArrayOperand)operand, varTable)
+                    + "\tiaload\n";
+        }
+        return getLoadInstruction(operand, varTable);
     }
 
     public static String createAssignStatement(AssignInstruction instruction, HashMap<String, Descriptor> varTable) {

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,12 @@ public static String createBinaryOpInstruction(BinaryOpInstruction instruction,`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`public static String createNoperInstruction(SingleOpInstruction instruction, HashMap<String, Descriptor> varTable) {`
`198`		`- return getLoadInstruction(instruction.getSingleOperand(), varTable);`
	`198`	`+ Element operand = instruction.getSingleOperand();`
	`199`	`+ if (operand instanceof ArrayOperand) {`
	`200`	`+ return getArrayLoadInstruction((ArrayOperand)operand, varTable)`
	`201`	`+ + "\tiaload\n";`
	`202`	`+ }`
	`203`	`+ return getLoadInstruction(operand, varTable);`
`199`	`204`	`}`
`200`	`205`
`201`	`206`	`public static String createAssignStatement(AssignInstruction instruction, HashMap<String, Descriptor> varTable) {`