VM (new pixeltower): inline execution loop

Author: MetsukiMio

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

@@ -20,6 +20,23 @@ class OMInterpreter
   private:
     void callDynamic(OMMethod *met);
     void popLastFrame();
+    void loop() {
+        jint result = 0;
+	while (!result)
+	{
+	    result = execute();
+	}
+
+	if (result == 2)
+	{
+	    return;
+	}
+	else
+	{
+	    logger.error("function exited with code {}", result);
+	    throw result;
+	}
+    }
 
     log::OMLogger logger;
     OMPixelTower *tower;

include/openminecraft/vm/pixeltower/v1/om_pixeltower_debugger.hpp

@@ -66,7 +66,10 @@ class OMDebugger
             }
 
             logger.debug("{}: {} {}", currentData,
-                         fmt::styled(fmt::format("{:#018x}", (size_t)*static_cast<void **>(currentData)), style), desc);
+                         fmt::styled(fmt::format(sizeof(void *) == 8 ? "{:#018x}" : "{:#010x}",
+                                                 (size_t)*static_cast<void **>(currentData)),
+                                     style),
+                         desc);
 
             currentData = (uint8_t *)currentData + sizeof(void *);
             if (currentData == v0::currentThread.stack)

src/vm/pixeltower/v0/om_pixeltower.cpp

@@ -36,11 +36,6 @@ void OMPixelTower::boot(OMMethod *method)
 
 void OMPixelTower::mainLoop()
 {
-    jint result = 0;
-    while (!result)
-    {
-        result = interpreter->execute();
-    }
 }
 
 void OMPixelTower::init(std::string basePath)
@@ -100,4 +95,4 @@ void OMPixelTower::destroyCurrentThread()
         mem::allocator::tracedFreeVMData(currentThread.stackEnd);
     }
 }
-} // namespace openminecraft::vm::pixeltower::v0
+} // namespace openminecraft::vm::pixeltower::v0

src/vm/pixeltower/v0/om_pixeltower_interpreter.cpp

@@ -48,6 +48,7 @@ void OMInterpreter::call(OMMethod *met)
         {
             *localAccess<void *>(i) = nullptr;
         }
+	loop();
         return;
     }
 
@@ -79,6 +80,8 @@ void OMInterpreter::call(OMMethod *met)
     currentThread.currentFrame = nextframe;
     stackPush();
     currentThread.pc = met->code;
+
+    loop();
 }
 
 void OMInterpreter::callDynamic(OMMethod *met)
@@ -100,6 +103,7 @@ void OMInterpreter::callDynamic(OMMethod *met)
         stackPop();
     }
 
+    // dynamic linking!
     OMMethod *codetarget = met;
     auto cls = static_cast<OMOOPDesc *>(args[0])->klass;
     while (cls != nullptr)
@@ -134,7 +138,8 @@ void OMInterpreter::callDynamic(OMMethod *met)
     currentThread.stackPointer = (jbyte *)nextframe - nextframe->method->maxLocals * sizeof(void *);
     currentThread.currentFrame = nextframe;
     stackPush();
-    currentThread.pc = codetarget->code;
+    currentThread.pc = nextframe->method->code;
+    loop();
 }
 
 void OMInterpreter::popLastFrame()
@@ -294,18 +299,17 @@ jint OMInterpreter::execute()
         auto ret = stackTopAccess<jint>();
         popLastFrame();
         stackPushAccess<jint>(ret);
-        return 0;
+        return 2;
     }
     case op_lreturn: {
         auto ret = stackTopAccessW<jlong>();
         popLastFrame();
         stackPushAccessW<jlong>(ret);
-        return 0;
+        return 2;
     }
     case op_return: {
-        bool isClinit = strcmp("<clinit>", currentThread.currentFrame->method->name) == 0;
         popLastFrame();
-        return isClinit ? 2 : 0;
+        return 2;
     }
     case op_putstatic: {
         auto n = *static_cast<OMField **>(static_cast<void *>(

src/vm/pixeltower/v0/om_pixeltower_klassloader.cpp

@@ -340,21 +340,6 @@ void OMKlassLoader::classInit(OMKlass *klass)
             logger.info("clinit found for {}, executing", klass->name);
 
             interpreter->call(me);
-            jint result = 0;
-            while (!result)
-            {
-                result = interpreter->execute();
-            }
-
-            if (result == 2) // clinit finish
-            {
-                break;
-            }
-            else
-            {
-                throw err::OMValidationError{
-                    err::ClassLoader, fmt::format("class clinit executing failed with code {}", result), klass->name};
-            }
         }
         me = me->next;
     }