Fetch Runtime before Tests in Github actions

* Fetch Runtime before Tests in Github actions

* update script

* cargo fmt

---------

Co-authored-by: Brian Pfretzschner <[email protected]>

Author: Pfarrer

.github/workflows/rust-build-test.yml

@@ -19,6 +19,9 @@ jobs:
     - name: Build
       run: cargo build
 
+    - name: Fetch Java Runtime
+      run: ./fetch_runtime.sh
+
     - name: Run tests
       run: cargo test
 

README.md

@@ -13,7 +13,7 @@ See it in action:
   - [x] Initialize VM & Runtime
   - [x] Run simple HelloWorld
 
-- [ ] Java 11
+- [x] Java 11
   - [x] Parse Classfiles
   - [x] Initialize VM & Runtime
-  - [ ] Run simple HelloWorld
+  - [x] Run simple HelloWorld

cli/src/execute.rs

@@ -2,9 +2,9 @@ use std::path::PathBuf;
 
 use loader::CompositeLoader;
 use model::vm::VmThread;
+use rt::bootstrap_vm;
 use tracing::Level;
 use vm::vm_thread::VmTheadImpl;
-use rt::bootstrap_vm;
 
 const MAIN_METHOD_NAME: &str = "main";
 const MAIN_METHOD_SIGNATURE: &str = "([Ljava/lang/String;)V";

cli/src/main.rs

@@ -2,9 +2,9 @@
 extern crate prettytable;
 
 use clap::{Parser, Subcommand};
+use std::path::PathBuf;
 use tracing::{level_filters::LevelFilter, Level};
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
-use std::path::PathBuf;
 
 mod execute;
 mod list_classes;
@@ -51,7 +51,13 @@ fn main() {
             class_paths,
             vm_init_log_level,
             vm_exec_log_level,
-        } => execute::run(main_class, class_paths, vm_init_log_level, vm_exec_log_level, set_log_level_fn),
+        } => execute::run(
+            main_class,
+            class_paths,
+            vm_init_log_level,
+            vm_exec_log_level,
+            set_log_level_fn,
+        ),
     };
 }
 
@@ -64,7 +70,11 @@ fn tracing_init() -> impl Fn(Level) {
         .with(filter)
         .init();
 
-    move |level: Level| reload_handle.modify(|layer| {
-        *layer = LevelFilter::from_level(level);
-    }).unwrap()
-}
+    move |level: Level| {
+        reload_handle
+            .modify(|layer| {
+                *layer = LevelFilter::from_level(level);
+            })
+            .unwrap()
+    }
+}

fetch_runtime.sh

@@ -4,8 +4,8 @@ shopt -s inherit_errexit
 
 mkdir -p ./rt/jmods/java.base
 
-podman run --rm -it --userns keep-id \
-    --security-opt label=disable \
+docker run --rm \
+    -u $(id -u "${USER}"):$(id -g "${USER}") \
     -v "./rt/jmods/java.base:/tmp/out" \
     eclipse-temurin:11 \
     sh -c "jmod extract --dir /tmp/out /opt/java/openjdk/jmods/java.base.jmod"

parser/src/version.rs

@@ -19,7 +19,10 @@ pub fn parse<T: Read>(reader: &mut T) -> Result<ClassVersion> {
     let major = util::read_u16(reader)?;
 
     if major > SUPPORTED_MAJOR_VERSION {
-        panic!("Unsupported Classfile version: {}.{} > {}.0.", major, minor, SUPPORTED_MAJOR_VERSION);
+        panic!(
+            "Unsupported Classfile version: {}.{} > {}.0.",
+            major, minor, SUPPORTED_MAJOR_VERSION
+        );
     }
 
     Ok(ClassVersion { major, minor })

rt/src/lib.rs

@@ -15,7 +15,6 @@ pub fn make_classloader(parser: &impl Parser) -> impl Classloader {
     ClassfileLoader::open(rt_path, parser).unwrap()
 }
 
-
 pub fn bootstrap_vm(classloader: impl Classloader + 'static) -> Vm {
     let vm = new_vm(native::NativeClassloader {
         classloader: Box::new(classloader),
@@ -29,4 +28,4 @@ pub fn bootstrap_vm(classloader: impl Classloader + 'static) -> Vm {
     );
 
     vm
-}
+}

rt/src/native/java_io_filedescriptor.rs

@@ -4,31 +4,30 @@ use vm::frame::VmFrameImpl;
 
 pub fn get_method(_jvm_class: &JvmClass, class_method: &ClassMethod) -> Option<NativeMethod> {
     match class_method.name.as_str() {
-        "initIDs" => Some(init_ids), // ()V
+        "initIDs" => Some(init_ids),     // ()V
         "getHandle" => Some(get_handle), // (I)J
         "getAppend" => Some(get_append), // (I)Z
         _ => None,
     }
 }
 
 /// ()V
-fn init_ids(_: &mut VmThread) {
-}
+fn init_ids(_: &mut VmThread) {}
 
 /// (I)J
 fn get_handle(vm_thread: &mut VmThread) {
     let frame = vm_thread.frame_stack.last_mut().unwrap();
-    
+
     let fd = frame.stack_pop_int();
     frame.stack_push(VmPrimitive::Long(fd as i64));
 }
 
 /// (I)Z
 fn get_append(vm_thread: &mut VmThread) {
     let frame = vm_thread.frame_stack.last_mut().unwrap();
-    
+
     let fd = frame.stack_pop_int();
 
     trace!("Push Boolean true for getAppend of fd {}", fd);
     frame.stack_push(VmPrimitive::Boolean(true));
-}
+}

rt/src/native/java_io_fileinputstream.rs

@@ -8,5 +8,4 @@ pub fn get_method(_jvm_class: &JvmClass, class_method: &ClassMethod) -> Option<N
 }
 
 /// ()V
-fn init_ids(_: &mut VmThread) {
-}
+fn init_ids(_: &mut VmThread) {}

rt/src/native/java_io_fileoutputstream.rs

@@ -3,15 +3,14 @@ use vm::frame::VmFrameImpl;
 
 pub fn get_method(_jvm_class: &JvmClass, class_method: &ClassMethod) -> Option<NativeMethod> {
     match class_method.name.as_str() {
-        "initIDs" => Some(init_ids), // ()V
+        "initIDs" => Some(init_ids),       // ()V
         "writeBytes" => Some(write_bytes), // ([BIIZ)V
         _ => None,
     }
 }
 
 /// ()V
-fn init_ids(_: &mut VmThread) {
-}
+fn init_ids(_: &mut VmThread) {}
 
 /// ([BIIZ)V
 fn write_bytes(vm_thread: &mut VmThread) {
@@ -30,12 +29,12 @@ fn write_bytes(vm_thread: &mut VmThread) {
 
         let fd_instance = match fos_instance.fields.get("fd").unwrap() {
             &VmPrimitive::Objectref(ref rc_fd_instance) => rc_fd_instance.borrow(),
-            a => panic!("Not implemented for {:?}", a)
+            a => panic!("Not implemented for {:?}", a),
         };
 
         match fd_instance.fields.get("fd").unwrap() {
             &VmPrimitive::Int(ref val) => val.clone(),
-            a => panic!("Not implemented for {:?}", a)
+            a => panic!("Not implemented for {:?}", a),
         }
     };