VM: update

Author: MetsukiMio

include/openminecraft/vm/pixeltower/om_pixeltower_interpreter.hpp

@@ -19,7 +19,6 @@ class OMInterpreter
     OMInterpreter(OMPixelTower &tower);
     ~OMInterpreter();
 
-    void execute(std::string clazz, std::string method, std::string sig);
     void execute(std::shared_ptr<OMClass> clazz, std::string method, std::string sig);
     void executeDynamic(std::string clazz, std::string method, std::string sig, std::shared_ptr<OMFrameMetadata> frame);
     void execute(std::shared_ptr<OMClass> clazz, std::shared_ptr<OMMethodInfo> mi);

src/vm/pixeltower/v0/om_pixeltower.cpp

@@ -1,6 +1,4 @@
 #include "openminecraft/vm/pixeltower/om_pixeltower.hpp"
-#include "openminecraft/binary/om_bin_hash.hpp"
-#include "openminecraft/i18n/om_i18n_res.hpp"
 #include "openminecraft/log/om_log_ansi.hpp"
 #include "openminecraft/log/om_log_common.hpp"
 #include "openminecraft/log/om_log_threadname.hpp"
@@ -46,16 +44,20 @@ void OMPixelTower::registerNativeFunc(std::string clazz, std::string func, std::
         }
     }
 
-    throw err::OMValidationError{err::Instructions, fmt::format("registering native function to a non-native function!"), fmt::format("{}.{}{}", clazz, func, desc)};
+    throw err::OMValidationError{err::Instructions,
+                                 fmt::format("registering native function to a non-native function!"),
+                                 fmt::format("{}.{}{}", clazz, func, desc)};
 }
 std::any OMPixelTower::callNativeFunc(std::string clazz, std::string func, std::string desc, std::any args)
 {
     auto key = fmt::format("{}.{}{}", clazz, func, desc);
-    if (nativeFuncs.count(key)) {
+    if (nativeFuncs.count(key))
+    {
         return nativeFuncs[key](args);
     }
 
-    throw err::OMValidationError{err::Instructions, fmt::format("native function not found"), fmt::format("{}.{}{}", clazz, func, desc)};
+    throw err::OMValidationError{err::Instructions, fmt::format("native function not found"),
+                                 fmt::format("{}.{}{}", clazz, func, desc)};
 }
 void OMPixelTower::loadClass(std::shared_ptr<classfile::OMClassFile> file)
 {
@@ -93,7 +95,7 @@ std::shared_ptr<OMClass> OMPixelTower::fetchClass(std::string name)
 }
 void OMPixelTower::execute(std::string clazz, std::string name, std::string desc)
 {
-    std::any_cast<std::shared_ptr<runtime::OMInterpreter>>(interpreter)->execute(clazz, name, desc);
+    std::any_cast<std::shared_ptr<runtime::OMInterpreter>>(interpreter)->execute(fetchClass(clazz), name, desc);
 }
 void OMPixelTower::debugStackStatus()
 {

src/vm/pixeltower/v0/om_pixeltower_interpreter.cpp

@@ -50,10 +50,6 @@ OMInterpreter::OMInterpreter(OMPixelTower &tower) : tower(tower), logger("pixelt
 OMInterpreter::~OMInterpreter()
 {
 }
-void OMInterpreter::execute(std::string clazz, std::string method, std::string sig)
-{
-    return execute(tower.fetchClass(clazz), method, sig);
-}
 void OMInterpreter::execute(std::shared_ptr<OMClass> clazz, std::string method, std::string sig)
 {
     for (auto &m : clazz->methods)
@@ -106,7 +102,7 @@ void OMInterpreter::executeDynamic(std::string clazz, std::string method, std::s
             tempst.pop();
         }
 
-        return execute((*((OMClass **)obj))->name, method, sig);
+        return execute(tower.fetchClass((*((OMClass **)obj))->name), method, sig);
     }
     else
     {