Jvm arg

Author: dlunch

jvm/src/array_class_definition.rs

@@ -7,12 +7,12 @@ use alloc::{
 use dyn_clone::clone_trait_object;
 use java_constants::ClassAccessFlags;
 
-use crate::{Result, class_definition::ClassDefinition, class_instance::ClassInstance, field::Field, method::Method, value::JavaValue};
+use crate::{Jvm, Result, class_definition::ClassDefinition, class_instance::ClassInstance, field::Field, method::Method, value::JavaValue};
 
 #[async_trait::async_trait]
 pub trait ArrayClassDefinition: ClassDefinition {
     fn element_type_name(&self) -> String;
-    async fn instantiate_array(&self, length: usize) -> Result<Box<dyn ClassInstance>>;
+    async fn instantiate_array(&self, jvm: &Jvm, length: usize) -> Result<Box<dyn ClassInstance>>;
 }
 
 clone_trait_object!(ArrayClassDefinition);
@@ -31,7 +31,7 @@ impl<T: ArrayClassDefinition> ClassDefinition for T {
         ClassAccessFlags::PUBLIC | ClassAccessFlags::FINAL
     }
 
-    async fn instantiate(&self) -> Result<Box<dyn ClassInstance>> {
+    async fn instantiate(&self, _: &Jvm) -> Result<Box<dyn ClassInstance>> {
         panic!("Cannot instantiate array class")
     }
 

jvm/src/class_definition.rs

@@ -5,14 +5,14 @@ use dyn_clone::{DynClone, clone_trait_object};
 
 use java_constants::ClassAccessFlags;
 
-use crate::{ArrayClassDefinition, ClassInstance, Field, JavaValue, Method, Result, as_any::AsAny};
+use crate::{ArrayClassDefinition, ClassInstance, Field, JavaValue, Jvm, Method, Result, as_any::AsAny};
 
 #[async_trait::async_trait]
 pub trait ClassDefinition: Sync + Send + AsAny + Debug + DynClone {
     fn name(&self) -> String;
     fn super_class_name(&self) -> Option<String>;
     fn access_flags(&self) -> ClassAccessFlags;
-    async fn instantiate(&self) -> Result<Box<dyn ClassInstance>>;
+    async fn instantiate(&self, jvm: &Jvm) -> Result<Box<dyn ClassInstance>>;
     fn method(&self, name: &str, descriptor: &str, is_static: bool) -> Option<Box<dyn Method>>;
     fn field(&self, name: &str, descriptor: &str, is_static: bool) -> Option<Box<dyn Field>>;
     fn fields(&self) -> Vec<Box<dyn Field>>;

jvm/src/jvm.rs

@@ -121,7 +121,7 @@ impl Jvm {
                 .await);
         }
 
-        let instance = class.definition.instantiate().await?;
+        let instance = class.definition.instantiate(self).await?;
 
         let thread_id = (self.inner.get_current_thread_id)();
         let mut threads = self.inner.threads.write();
@@ -152,7 +152,7 @@ impl Jvm {
         let class = self.resolve_class(&class_name).await?.definition;
         let array_class = class.as_array_class_definition().unwrap();
 
-        let instance = array_class.instantiate_array(length).await?;
+        let instance = array_class.instantiate_array(self, length).await?;
 
         let thread_id = (self.inner.get_current_thread_id)();
         let mut threads = self.inner.threads.write();

jvm_rust/src/array_class_definition.rs

@@ -5,7 +5,7 @@ use alloc::{
 };
 use core::fmt::{self, Debug, Formatter};
 
-use jvm::{ArrayClassDefinition, ClassInstance, Result};
+use jvm::{ArrayClassDefinition, ClassInstance, Jvm, Result};
 
 use crate::array_class_instance::ArrayClassInstanceImpl;
 
@@ -34,7 +34,7 @@ impl ArrayClassDefinition for ArrayClassDefinitionImpl {
         self.inner.element_type_name.clone()
     }
 
-    async fn instantiate_array(&self, length: usize) -> Result<Box<dyn ClassInstance>> {
+    async fn instantiate_array(&self, _: &Jvm, length: usize) -> Result<Box<dyn ClassInstance>> {
         Ok(Box::new(ArrayClassInstanceImpl::new(self, length)))
     }
 }

jvm_rust/src/class_definition.rs

@@ -15,7 +15,7 @@ use parking_lot::RwLock;
 use classfile::ClassInfo;
 use java_class_proto::JavaClassProto;
 use java_constants::{ClassAccessFlags, FieldAccessFlags, MethodAccessFlags};
-use jvm::{ClassDefinition, ClassInstance, Field, JavaType, JavaValue, Method, Result};
+use jvm::{ClassDefinition, ClassInstance, Field, JavaType, JavaValue, Jvm, Method, Result};
 
 use crate::{class_instance::ClassInstanceImpl, field::FieldImpl, method::MethodImpl};
 
@@ -105,7 +105,7 @@ impl ClassDefinition for ClassDefinitionImpl {
         self.inner.access_flags
     }
 
-    async fn instantiate(&self) -> Result<Box<dyn ClassInstance>> {
+    async fn instantiate(&self, _: &Jvm) -> Result<Box<dyn ClassInstance>> {
         Ok(Box::new(ClassInstanceImpl::new(self)))
     }