VM (new pixeltower): libffi 引入

Author: MetsukiMio

include/openminecraft/vm/pixeltower/v0/om_pixeltower_threads.hpp

@@ -355,6 +355,13 @@ inline std::string methodName(OMMethod *m)
     return fmt::format("{}.{}{}", m->klass->name, m->name, m->desc);
 }
 
+inline std::string currentPosition()
+{
+    auto me = currentThread.currentFrame->method;
+    return fmt::format("{}.{}{} + {}", me->klass->name, me->name, me->desc,
+                       static_cast<size_t>(currentThread.pc - me->code));
+}
+
 } // namespace openminecraft::vm::pixeltower::v0
 
 #endif

src/vm/pixeltower/v0/om_pixeltower_interpreter.cpp

@@ -12,7 +12,6 @@
 #include "openminecraft/vm/pixeltower/v0/om_pixeltower_klass.hpp"
 #include "openminecraft/vm/pixeltower/v0/om_pixeltower_oop.hpp"
 #include "openminecraft/vm/pixeltower/v0/om_pixeltower_threads.hpp"
-#include <cstring>
 #include <vector>
 
 namespace openminecraft::vm::pixeltower::v0
@@ -58,17 +57,17 @@ void OMInterpreter::call(OMMethod *met)
                                  met->args * sizeof(void *));
     nextframe->method = met;
 
+    // TODO: optimization
+    for (int i = 0; i < met->maxLocals; i++)
+    {
+        *localAccess<void *>(i, nextframe) = nullptr;
+    }
     std::vector<void *> args(met->args);
     for (int i = met->args - 1; i >= 0; i--)
     {
         args[i] = stackTopAccess<void *>();
         stackPop();
     }
-
-    for (int i = 0; i < met->maxLocals; i++)
-    {
-        *localAccess<void *>(i, nextframe) = nullptr;
-    }
     for (int i = 0; i < args.size(); i++)
     {
         *localAccess<void *>(i, nextframe) = args[i];
@@ -87,12 +86,6 @@ void OMInterpreter::call(OMMethod *met)
 
 void OMInterpreter::callDynamic(OMMethod *met)
 {
-    if (met->accessFlags & JVM_Acc_Native)
-    {
-        throw err::OMValidationError{err::Instructions, "native functions not supported!",
-                                     fmt::format("{}.{}{}", met->klass->name, met->name, met->desc)};
-    }
-
     auto frame = currentThread.currentFrame;
     auto nextframe = (OMFrame *)((uint8_t *)currentThread.stackPointer - sizeof(OMFrame) + sizeof(void *) +
                                  met->args * sizeof(void *));
@@ -109,7 +102,8 @@ void OMInterpreter::callDynamic(OMMethod *met)
     OMMethod *codetarget = cls->vtable[hash_compile_time(temp.c_str())];
     if (codetarget == nullptr)
     {
-        codetarget = met;
+        throw err::OMValidationError{err::Instructions, fmt::format("vtable corruption found at klass {}", cls->name),
+                                     methodName(frame->method)};
     }
     nextframe->method = codetarget;
 
@@ -365,15 +359,10 @@ jint OMInterpreter::execute()
         return EXEC_OK;
     }
     default: {
-    endExec:
-        logger.debug("unknown operand at {}", (void *)currentThread.pc);
-        logger.debug("thread {}", (void *)&currentThread.id);
-        logger.debug("pc pointed at {} ({}.{}{} + {})", (void *)currentThread.pc,
-                     currentThread.currentFrame->method->klass->name, currentThread.currentFrame->method->name,
-                     currentThread.currentFrame->method->desc,
-                     reinterpret_cast<size_t>(
-                         reinterpret_cast<void *>(static_cast<uint8_t *>(currentThread.pc) -
-                                                  static_cast<uint8_t *>(currentThread.currentFrame->method->code))));
+        logger.error("We are hitting Mazarine End!");
+        logger.error("unknown operand at {}", fmt::ptr(currentThread.pc));
+        logger.error("thread {}", fmt::ptr(&currentThread.id));
+        logger.error("pc pointed at {} ({})", fmt::ptr(currentThread.pc), currentPosition());
 
         debugger.debugStack();
 

xmake.lua

@@ -80,7 +80,7 @@ add_files("tools/om_bundle_maker.cpp")
 target("openminecraft-plat")
 set_kind("static")
 add_includedirs("include")
-add_packages("freetype", "harfbuzz", "stb", "vulkan-headers", "glm", "bullet3", "vulkan-hpp", "shaderc", "fmt", "boost", "nlohmann_json", "libsdl3", { system = false })
+add_packages("freetype", "harfbuzz", "stb", "vulkan-headers", "glm", "bullet3", "vulkan-hpp", "shaderc", "fmt", "boost", "nlohmann_json", "libsdl3", "libffi", { system = false })
 if not is_plat("windows") then
     add_files("plat/unix/**.cpp")
 end
@@ -125,7 +125,7 @@ end
 add_files("launcher/**.cpp")
 add_deps("openminecraft-log", "openminecraft-vm", "openminecraft-binary", "openminecraft-mem", "openminecraft-io", "openminecraft-vfs", "openminecraft-boot", "openminecraft-util", "openminecraft-i18n", "openminecraft-renderer", "openminecraft-plat")
 
-add_packages("freetype", "harfbuzz", "stb", "vulkan-headers", "glm", "bullet3", "vulkan-hpp", "shaderc", "fmt", "boost", "nlohmann_json", "libsdl3", { system = false })
+add_packages("freetype", "harfbuzz", "stb", "vulkan-headers", "glm", "bullet3", "vulkan-hpp", "shaderc", "fmt", "boost", "nlohmann_json", "libsdl3", "libffi", { system = false })
 if not mobile() and not vulkandyn() and not apple() then
     add_packages("vulkan-loader")
 end