update

src/main/java/haidnor/jvm/HaidnorJVM.java

@@ -5,7 +5,7 @@ import haidnor.jvm.classloader.JVMClassLoader;
 import haidnor.jvm.core.JavaExecutionEngine;
 import haidnor.jvm.rtda.Metaspace;
 import haidnor.jvm.runtime.JVMThread;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.JVMThreadHolder;
 import lombok.SneakyThrows;
 import org.apache.commons.cli.*;
 
@@ -84,7 +84,8 @@ public class HaidnorJVM {
     public static void testRun(Class<?> mainClass) {
         JVMThreadHolder.set(new JVMThread());
         JVMClassLoader bootClassLoader = new JVMClassLoader("ApplicationClassLoader");
-        JavaClass mainMeteKlass = bootClassLoader.loadWithClassPath(mainClass.getName().replace('.', '/'));
-        JavaExecutionEngine.callMain(mainMeteKlass);
+        JavaClass javaClass = bootClassLoader.loadWithClassPath(mainClass.getName().replace('.', '/'));
+        JavaExecutionEngine.callMain(javaClass);
     }
+
 }

src/main/java/haidnor/jvm/core/CodeStream.java

@@ -1,4 +1,4 @@
-package haidnor.jvm.util;
+package haidnor.jvm.core;
 
 
 import haidnor.jvm.bcel.classfile.Code;

src/main/java/haidnor/jvm/core/JVMThreadHolder.java

@@ -1,4 +1,4 @@
-package haidnor.jvm.util;
+package haidnor.jvm.core;
 
 import haidnor.jvm.runtime.JVMThread;
 

src/main/java/haidnor/jvm/core/JavaExecutionEngine.java

@@ -9,8 +9,6 @@ import haidnor.jvm.instruction.control.ReturnableInstruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.JVMThread;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/haidnor/jvm/instruction/Instruction.java

@@ -1,7 +1,7 @@
 package haidnor.jvm.instruction;
 
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/haidnor/jvm/instruction/InstructionFactory.java

@@ -11,7 +11,7 @@ import haidnor.jvm.instruction.math.*;
 import haidnor.jvm.instruction.references.*;
 import haidnor.jvm.instruction.stack.*;
 import haidnor.jvm.instruction.stores.*;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public abstract class InstructionFactory {
 

src/main/java/haidnor/jvm/instruction/comparisons/DCMPG.java

@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * @author wang xiang

src/main/java/haidnor/jvm/instruction/comparisons/DCMPL.java

@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * @author wang xiang

src/main/java/haidnor/jvm/instruction/comparisons/FCMPG.java

@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 /**
  * @author wang xiang
  */

src/main/java/haidnor/jvm/instruction/comparisons/FCMPL.java

@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 /**
  * @author wang xiang
  */

src/main/java/haidnor/jvm/instruction/comparisons/IFEQ.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFEQ extends Instruction {
 

src/main/java/haidnor/jvm/instruction/comparisons/IFGE.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFGE extends Instruction {
     /**

src/main/java/haidnor/jvm/instruction/comparisons/IFGT.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFGT extends Instruction {
     /**

src/main/java/haidnor/jvm/instruction/comparisons/IFLE.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFLE extends Instruction {
     /**

src/main/java/haidnor/jvm/instruction/comparisons/IFLT.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFLT extends Instruction {
     /**

src/main/java/haidnor/jvm/instruction/comparisons/IFNE.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class IFNE extends Instruction {
     /**

src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPEQ.java

@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 /**
  * @author wang xiang
  */

src/main/java/haidnor/jvm/instruction/comparisons/IF_ACMPNE.java

@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 /**
  * @author wang xiang
  */

src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPEQ.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.

src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGE.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.

src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPGT.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.

src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLE.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.

src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPLT.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.

src/main/java/haidnor/jvm/instruction/comparisons/IF_ICMPNE.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.comparisons;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.

src/main/java/haidnor/jvm/instruction/comparisons/LCMP.java

@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.comparisons;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LCMP extends Instruction {
 

src/main/java/haidnor/jvm/instruction/constants/ACONST_NULL.java

@@ -4,7 +4,7 @@ import haidnor.jvm.bcel.Const;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class ACONST_NULL extends Instruction {
 

src/main/java/haidnor/jvm/instruction/constants/BIPUSH.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/DCONST_0.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/DCONST_1.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/FCONST_1.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/FCONST_2.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/ICONST_0.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/ICONST_1.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/ICONST_2.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/ICONST_3.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/ICONST_4.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/ICONST_5.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/ICONST_M1.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/LCONST_0.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/LCONST_1.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/LDC.java

@@ -5,7 +5,7 @@ import haidnor.jvm.bcel.classfile.*;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/LDC2W.java

@@ -8,7 +8,7 @@ import haidnor.jvm.bcel.classfile.ConstantPool;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * 将 long 或 double 型常量从常量池中推送至栈顶 (宽索引)

src/main/java/haidnor/jvm/instruction/constants/LDC_W.java

@@ -5,7 +5,7 @@ import haidnor.jvm.bcel.classfile.*;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import lombok.SneakyThrows;
 
 /**

src/main/java/haidnor/jvm/instruction/constants/NOP.java

@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.constants;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 /**
  * Java VM opcode.

src/main/java/haidnor/jvm/instruction/constants/SIPUSH.java

@@ -3,7 +3,7 @@ package haidnor.jvm.instruction.constants;
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 import haidnor.jvm.bcel.Const;
 
 /**

src/main/java/haidnor/jvm/instruction/control/ARETURN.java

@@ -2,8 +2,8 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class ARETURN extends ReturnableInstruction {
 

src/main/java/haidnor/jvm/instruction/control/DRETURN.java

@@ -2,8 +2,8 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class DRETURN extends ReturnableInstruction {
 

src/main/java/haidnor/jvm/instruction/control/FRETURN.java

@@ -2,8 +2,8 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class FRETURN extends ReturnableInstruction {
 

src/main/java/haidnor/jvm/instruction/control/IRETURN.java

@@ -2,8 +2,8 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.runtime.Frame;
 import haidnor.jvm.runtime.StackValue;
-import haidnor.jvm.util.CodeStream;
-import haidnor.jvm.util.JVMThreadHolder;
+import haidnor.jvm.core.CodeStream;
+import haidnor.jvm.core.JVMThreadHolder;
 
 public class IRETURN extends ReturnableInstruction {
 

src/main/java/haidnor/jvm/instruction/control/LOOKUPSWITCH.java

@@ -2,7 +2,7 @@ package haidnor.jvm.instruction.control;
 
 import haidnor.jvm.instruction.Instruction;
 import haidnor.jvm.runtime.Frame;
-import haidnor.jvm.util.CodeStream;
+import haidnor.jvm.core.CodeStream;
 
 public class LOOKUPSWITCH extends Instruction {