VM: newarray 指令实现

Author: MetsukiMio

docs/vm-instructions.md

@@ -0,0 +1,162 @@
+Instruction | impl status
+----- | -----
+nop | v0
+aconst_null | v0
+iconst_n | v0
+lconst_n | v0
+fconst_n | v0
+dconst_n | v0
+bipush | v0
+sipush | X
+ldc | v0
+ldc_w | v0
+ldc2_w | v0
+iload | X
+lload | X
+fload | X
+dload | X
+aload | v0
+iload_n | v0
+lload_n | X
+fload_n | X
+dload_n | X
+aload_n | v0
+iaload | X
+laload | X
+faload | X
+daload | X
+aaload | X
+baload | X
+caload | X
+saload | X
+istore | X
+lstore | X
+fstore | X
+dstore | X
+astore | v0
+istore_n | v0
+lstore_n | X
+fstore_n | X
+dstore_n | X
+astore_n | v0
+iastore | X
+lastore | X
+fastore | X
+dastore | X
+aastore | X
+bastore | X
+castore | X
+sastore | X
+pop | v0
+pop2 | X
+dup | v0
+dup_x1 | X
+dup_x2 | X
+dup2 | X
+dup2_x1 | X
+dup2_x2 | X
+swap | X
+iadd | v0
+ladd | X
+fadd | X
+dadd | X
+isub | X
+lsub | X
+fsub | X
+dsub | X
+imul | X
+lmul | X
+fmul | X
+dmul | X
+idiv | X
+ldiv | X
+fdiv | X
+ddiv | X
+irem | X
+lrem | X
+frem | X
+drem | X
+ineg | X
+lneg | X
+fneg | X
+dneg | X
+ishl | X
+lshl | X
+ishr | X
+lshr | X
+iushr | X
+lushr | X
+iand | X
+land | X
+ior |  X
+lor | X
+iinc | v0
+i2l | X
+i2f | X
+i2d | X
+l2i | X
+l2f | X
+l2d | X
+f2i | X
+f2l | X
+d2i | X
+f2d | X
+d2l | X
+d2f | X
+i2b | v0
+i2c | X
+i2s | v0
+lcmp | X
+fcmpl | X
+fcmpg | X
+dcmpl | X
+dcmpg | X
+ifeq | X
+ifne | v0
+iflt | X
+ifge | X
+ifgt | X
+ifle | X
+if_icmpeq | X
+if_icmpne | v0
+if_icmplt | X
+if_icmpge | X
+if_icmpgt | X
+if_icmple | X
+if_acmpeq | X
+if_acmpne | X
+goto | X
+jsr | X
+ret | X
+tableswitch | X
+lookupswitch | X
+ireturn | v0
+lreturn | X
+freturn | X
+dreturn | X
+areturn | X
+return | v0
+getstatic | v0
+putstatic | v0
+getfield | v0
+putfield | v0
+invokevirtual | v0
+invokespecial | v0
+invokestatic | v0
+invokeinterface | v0
+invokedynamic | X
+new | v0
+newarray | X
+anewarray | X
+arraylength | X
+athrow | X
+checkcast | X 
+instanceof | X
+monitorenter | X
+monitorexit | X
+wide | X
+multianewarray | X
+ifnull | X
+ifnonnull | X
+goto_w | X
+jsr_w | X

include/openminecraft/vm/pixeltower/om_pixeltower_interpreter.hpp

@@ -2,8 +2,6 @@
 #define OM_PIXELTOWER_INTERPRETER_HPP
 
 #include "openminecraft/log/om_log_common.hpp"
-#include "openminecraft/util/om_util_result.hpp"
-#include "openminecraft/vm/err/om_validation_error.hpp"
 #include "openminecraft/vm/pixeltower/om_pixeltower.hpp"
 #include "openminecraft/vm/pixeltower/om_pixeltower_array_structdef.hpp"
 #include "openminecraft/vm/pixeltower/om_pixeltower_frame_structdef.hpp"
@@ -28,39 +26,10 @@ class OMInterpreter
 
     std::unordered_map<std::thread::id, std::stack<std::any>> stack;
 
-    void operand_invokeany(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_dup(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_return(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_ireturn(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_new(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_aload_n(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_if_acmpne(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_iconst_n(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_lconst_n(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_fconst_n(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_dconst_n(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_nop(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_aconst_null(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_pop(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_astore_n(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_istore_n(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_invokeinterface(std::shared_ptr<OMFrameMetadata> frame);
     void operand_putstatic(std::shared_ptr<OMFrameMetadata> frame);
     void operand_putfield(std::shared_ptr<OMFrameMetadata> frame);
     void operand_getstatic(std::shared_ptr<OMFrameMetadata> frame);
     void operand_getfield(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_iload_n(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_bipush(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_invokevirtual(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_ldc(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_ldc_w(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_iadd(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_i2b(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_i2s(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_iinc(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_ifne(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_astore(std::shared_ptr<OMFrameMetadata> frame);
-    void operand_aload(std::shared_ptr<OMFrameMetadata> frame);
 
     void *newString(std::string data);
 

src/vm/classfile/om_class_file.cpp

@@ -7,7 +7,6 @@
 #include <memory>
 #include <openminecraft/binary/om_bin_endians.hpp>
 #include <openminecraft/vm/classfile/om_class_file.hpp>
-#include <stdexcept>
 
 using namespace openminecraft::binary;
 using namespace openminecraft::binary::hash;
@@ -22,7 +21,6 @@ OMClassFileParser::OMClassFileParser(std::shared_ptr<std::istream> str) : io::OM
 
 OMClassFileParser::~OMClassFileParser()
 {
-    // this->logger->info("Destroying class file parser");
     io::OMParser::~OMParser();
 }