ext: method converter

Signed-off-by: imkiva <[email protected]>
imkiva · Jun 20, 2018 · 791ec70 · 791ec70
1 parent d016783
commit 791ec70
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/ext/objectConverter.cpp b/ext/objectConverter.cpp
@@ -2,7 +2,8 @@
 // Created by kiva on 2018/6/20.
 //
 
-
+#include <kivm/bytecode/invocationContext.h>
+#include <kivm/runtime/javaThread.h>
 #include <kivm/oop/instanceOop.h>
 #include <kivm/oop/primitiveOop.h>
 #include <kivm/oop/mirrorOop.h>
@@ -11,6 +12,28 @@
 namespace helper {
     using namespace kivm;
 
+    void callMethod(MethodID *method, const std::list<oop> &args) {
+        auto thread = Threads::currentThread();
+        if (thread == nullptr) {
+            // java.lang.IllegalStateException: not a Java thread
+            return;
+        }
+
+        InvocationContext::invokeWithArgs(thread, method->_method, args);
+        if (thread->isExceptionOccurred()) {
+            KiVM::uncaughtException(thread);
+        }
+    }
+
+    void convertMethods(InstanceKlass *instanceKlass) {
+        for (auto e : instanceKlass->getDeclaredMethods()) {
+            auto methodId = e.second;
+            if (methodId->_method->isStatic()) {
+                callMethod(methodId, {/* args */});
+            }
+        }
+    }
+
     void convertStaticFields(InstanceKlass *instanceKlass) {
         for (auto e : instanceKlass->getStaticFields()) {
             auto fieldId = e.second;

diff --git a/include/kivm/runtime/javaThread.h b/include/kivm/runtime/javaThread.h
@@ -94,6 +94,10 @@ namespace kivm {
         inline bool isExceptionOccurred() const {
             return _exceptionOop != nullptr;
         }
+
+        inline instanceOop getException() const {
+            return _exceptionOop;
+        }
     };
 
     // The Java main thread