VM: Bug fix

Author: MetsukiMio

include/openminecraft/vm/pixeltower/om_pixeltower_class_structdef.hpp

@@ -45,7 +45,7 @@ class OMClass
     std::string sourceFile;
     std::shared_ptr<OMClass> superClass;
     std::vector<std::shared_ptr<OMClass>> interfaces;
-    std::list<OMFieldInfo> fields;
+    std::list<std::shared_ptr<OMFieldInfo>> fields;
     std::list<std::shared_ptr<OMMethodInfo>> methods;
     std::unordered_map<uint16_t, std::shared_ptr<classfile::OMClassConstant>> *mapping;
     uint64_t objectLength = 0;

src/vm/pixeltower/om_pixeltower_class.cpp

@@ -28,14 +28,14 @@ void OMClass::calcFieldOffsets()
     {
         uint64_t *length = &objectLength;
 
-        if ((field.accessFlag & JVM_Acc_Static) != 0)
+        if ((field->accessFlag & JVM_Acc_Static) != 0)
         {
             length = &staticFieldLength;
         }
 
-        field.offset = *length;
+        field->offset = *length;
 
-        switch (field.type)
+        switch (field->type)
         {
         case Bytes4:
             *length += 4 - (*length % 4);

src/vm/pixeltower/om_pixeltower_classloader.cpp

@@ -58,10 +58,10 @@ util::OMResult<std::any, err::OMValidationError> OMClassLoader::loadClass(std::s
         auto fn = file->mapping[field->nameIndex]->to<OMClassConstantUtf8>();
         auto fd = file->mapping[field->descIndex]->to<OMClassConstantUtf8>();
         auto m = fd->data;
-        OMFieldInfo f;
-        f.accessFlag = field->accessFlags;
-        f.name = m;
-        f.desc = fd->data;
+        auto f = std::make_shared<OMFieldInfo>();
+        f->accessFlag = field->accessFlags;
+        f->name = fn->data;
+        f->desc = fd->data;
         switch (m[0])
         {
         case 'Z':
@@ -70,22 +70,22 @@ util::OMResult<std::any, err::OMValidationError> OMClassLoader::loadClass(std::s
         case 'S':
         case 'F':
         case 'C':
-            f.type = Bytes4;
+            f->type = Bytes4;
             break;
         case 'J':
         case 'D':
-            f.type = Bytes8;
+            f->type = Bytes8;
             break;
         case '[':
         case 'L': {
-            f.type = BytesP;
+            f->type = BytesP;
             break;
         }
         default:
             return util::OMResult<std::any, err::OMValidationError>::err(
-                {err::ClassLoader, fmt::format("unknown field descriptor {}", fn->data), clsdata->name});
+                {err::ClassLoader, fmt::format("unknown field descriptor {}", m), clsdata->name});
         }
-        clsdata->fields.emplace_back(f);
+        clsdata->fields.push_back(f);
     }
 
     for (auto attrs : file->attrs)
@@ -124,6 +124,7 @@ util::OMResult<std::any, err::OMValidationError> OMClassLoader::loadClass(std::s
     {
         if (me->name == "<clinit>")
         {
+            logger.info("{} loaded with class init func", clsdata->name);
             return std::any_cast<std::shared_ptr<runtime::OMInterpreter>>(interpreter)->execute(clsdata, me);
         }
     }

src/vm/pixeltower/om_pixeltower_interpreter.cpp

@@ -548,16 +548,19 @@ OMResult<std::any, err::OMValidationError> OMInterpreter::operand_putstatic(std:
 
     for (auto fi : res.unwrap()->fields)
     {
-        if (fi.name == name && (fi.accessFlag & JVM_Acc_Static))
+        if (fi->name == name && (fi->accessFlag & JVM_Acc_Static))
         {
-            writeStackTop((void *)((uint8_t *)res.unwrap()->staticFieldBlock + fi.offset));
+            writeStackTop((void *)((uint8_t *)res.unwrap()->staticFieldBlock + fi->offset));
+            frame->offset += 3;
             return OMResult<std::any, err::OMValidationError>::ok(nullptr);
         }
     }
-
+    logger.debug("not found!");
     frame->offset += 3;
 
-    return OMResult<std::any, err::OMValidationError>::ok(nullptr);
+    return OMResult<std::any, err::OMValidationError>::err(
+        {err::Instructions, fmt::format("static field not found for {} with name {}", cls, name),
+         fetchCurrentPosition(frame)});
 }
 void OMInterpreter::operand_istore_n(std::shared_ptr<OMFrameMetadata> frame)
 {

src/vm/pixeltower/om_pixeltower_memorymanager.cpp

@@ -138,9 +138,9 @@ void OMMemoryManager::searchFromInstance(void *b)
         auto arrdata = ((uint8_t *)b + sizeof(void *));
         for (auto fi : clazz->fields)
         {
-            if (fi.type == OMFieldType::BytesP && (fi.accessFlag & JVM_Acc_Static) == 0)
+            if (fi->type == OMFieldType::BytesP && (fi->accessFlag & JVM_Acc_Static) == 0)
             {
-                searchFromInstance(*(void **)(arrdata + fi.offset));
+                searchFromInstance(*(void **)(arrdata + fi->offset));
             }
         }
     }
@@ -149,9 +149,9 @@ void OMMemoryManager::seatchFromStatic(std::shared_ptr<OMClass> cls)
 {
     for (auto fi : cls->fields)
     {
-        if (fi.type == OMFieldType::BytesP && (fi.accessFlag & JVM_Acc_Static) == 0)
+        if (fi->type == OMFieldType::BytesP && (fi->accessFlag & JVM_Acc_Static) == 0)
         {
-            searchFromInstance(*(void **)((uint8_t *)cls->staticFieldBlock + fi.offset));
+            searchFromInstance(*(void **)((uint8_t *)cls->staticFieldBlock + fi->offset));
         }
     }
 }

vmstd/src/java/io/PrintStream.java

@@ -1,5 +1,8 @@
 package java.io;
 
 public class PrintStream {
-    
+    public void println(char c) {}
+    public void println(long c) {}
+    public void println(float c) {}
+    public void println(double c) {}
 }