Fix NativeCallSystemArrayCopy test

hextriclosan · Oct 23, 2024 · c66377f · c66377f
1 parent c18374e
commit c66377f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/tests/should_do_native_call_on_system_array_copy.rs b/tests/should_do_native_call_on_system_array_copy.rs
@@ -3,7 +3,6 @@ use utils::get_long;
 use utils::setup;
 
 #[test]
-#[ignore]
 fn should_do_native_call_on_system_array_copy() {
     let mut vm = setup();
     let last_frame_value = vm

diff --git a/tests/test_data/NativeCallSystemArrayCopy.java b/tests/test_data/NativeCallSystemArrayCopy.java
@@ -1,7 +1,14 @@
 package samples.nativecall.system;
 
+import java.util.Map;
+import java.util.HashMap;
+
 public class NativeCallSystemArrayCopy {
     public static void main(String[] args) {
+        var props = new HashMap<String, String>();
+        props.put("java.class.version", "67.0"); //  fixme: move to VM init stage
+        jdk.internal.misc.VM.saveProperties(props); // javac --add-exports java.base/jdk.internal.misc=ALL-UNNAMED  -d . NativeCallSystemArrayCopy.java
+
         long sum = intArr() + longArr() + intArrOverlapping() + fromBaseArray();
     }
 

diff --git a/tests/test_data/samples/nativecall/system/NativeCallSystemArrayCopy.class b/tests/test_data/samples/nativecall/system/NativeCallSystemArrayCopy.class
diff --git a/vm/src/execution_engine/system_native_table.rs b/vm/src/execution_engine/system_native_table.rs
@@ -1,4 +1,5 @@
 use crate::error::Error;
+use crate::helper::i64_to_vec;
 use crate::system_native::class::{get_modifiers_wrp, get_primitive_class_wrp};
 use crate::system_native::string::intern_wrp;
 use crate::system_native::system::{arraycopy_wrp, current_time_millis_wrp};
@@ -61,6 +62,13 @@ static SYSTEM_NATIVE_TABLE: Lazy<
         "jdk/internal/misc/CDS:initializeFromArchive:(Ljava/lang/Class;)V",
         void_stub as fn(&[i32]) -> crate::error::Result<Vec<i32>>,
     );
+    table.insert(
+        "jdk/internal/misc/VM:initialize:()V",
+        void_stub as fn(&[i32]) -> crate::error::Result<Vec<i32>>,
+    );
+    table.insert("java/lang/Runtime:maxMemory:()J", |_args: &[i32]| {
+        return_argument_stub(&i64_to_vec(i64::MAX))
+    });
 
     table
 });