From 0e6fce058fd6c9f68ea41cbefbfc93598d928fe8 Mon Sep 17 00:00:00 2001
From: Shautvast <sander.hautvast@top-squad.nl>
Date: Fri, 24 Nov 2023 23:04:00 +0100
Subject: [PATCH] slightly smarter

---
 src/classloader/code_parser.rs | 40 +++++++++++++++++-----------------
 src/vm/opcodes.rs              | 20 -----------------
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/src/classloader/code_parser.rs b/src/classloader/code_parser.rs
index 98b8f54..b29452f 100644
--- a/src/classloader/code_parser.rs
+++ b/src/classloader/code_parser.rs
@@ -66,26 +66,26 @@ fn get_opcode(opcodes: &[u8], c: &mut usize) -> Opcode {
         23 => FLOAD(read_u8(opcodes, c)),
         24 => DLOAD(read_u8(opcodes, c)),
         25 => ALOAD(read_u8(opcodes, c)),
-        26 => ILOAD_0,
-        27 => ILOAD_1,
-        28 => ILOAD_2,
-        29 => ILOAD_3,
-        30 => LLOAD_0,
-        31 => LLOAD_1,
-        32 => LLOAD_2,
-        33 => LLOAD_3,
-        34 => FLOAD_0,
-        35 => FLOAD_1,
-        36 => FLOAD_2,
-        37 => FLOAD_3,
-        38 => DLOAD_0,
-        39 => DLOAD_1,
-        40 => DLOAD_2,
-        41 => DLOAD_3,
-        42 => ALOAD_0,
-        43 => ALOAD_1,
-        44 => ALOAD_2,
-        45 => ALOAD_3,
+        26 => ILOAD(0),
+        27 => ILOAD(1),
+        28 => ILOAD(2),
+        29 => ILOAD(3),
+        30 => LLOAD(0),
+        31 => LLOAD(1),
+        32 => LLOAD(2),
+        33 => LLOAD(3),
+        34 => FLOAD(0),
+        35 => FLOAD(1),
+        36 => FLOAD(2),
+        37 => FLOAD(3),
+        38 => DLOAD(0),
+        39 => DLOAD(1),
+        40 => DLOAD(2),
+        41 => DLOAD(3),
+        42 => ALOAD(0),
+        43 => ALOAD(1),
+        44 => ALOAD(2),
+        45 => ALOAD(3),
         46 => IALOAD,
         47 => LALOAD,
         48 => FALOAD,
diff --git a/src/vm/opcodes.rs b/src/vm/opcodes.rs
index 9267638..f90733f 100644
--- a/src/vm/opcodes.rs
+++ b/src/vm/opcodes.rs
@@ -34,26 +34,6 @@ pub(crate) enum Opcode {
     WIDE_DLOAD(u16),
     ALOAD(u8),
     WIDE_ALOAD(u16),
-    ILOAD_0,
-    ILOAD_1,
-    ILOAD_2,
-    ILOAD_3,
-    LLOAD_0,
-    LLOAD_1,
-    LLOAD_2,
-    LLOAD_3,
-    FLOAD_0,
-    FLOAD_1,
-    FLOAD_2,
-    FLOAD_3,
-    DLOAD_0,
-    DLOAD_1,
-    DLOAD_2,
-    DLOAD_3,
-    ALOAD_0,
-    ALOAD_1,
-    ALOAD_2,
-    ALOAD_3,
     IALOAD,
     LALOAD,
     FALOAD,