Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/io/file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ impl File {
RuntimeClassProto {
name: "java/io/File",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<clinit>", "()V", Self::clinit, MethodAccessFlags::STATIC),
JavaMethodProto::new("<init>", "(Ljava/lang/String;)V", Self::init, Default::default()),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/lang/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ impl Class {
RuntimeClassProto {
name: "java/lang/Class",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<init>", "()V", Self::init, Default::default()),
JavaMethodProto::new("getName", "()Ljava/lang/String;", Self::get_name, Default::default()),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/lang/throwable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ impl Throwable {
RuntimeClassProto {
name: "java/lang/Throwable",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<init>", "()V", Self::init, Default::default()),
JavaMethodProto::new("<init>", "(Ljava/lang/String;)V", Self::init_with_message, Default::default()),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/net/url.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ impl URL {
RuntimeClassProto {
name: "java/net/URL",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<init>", "(Ljava/lang/String;)V", Self::init_with_spec, Default::default()),
JavaMethodProto::new(
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/array_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ impl ArrayList {
RuntimeClassProto {
name: "java/util/ArrayList",
parent_class: Some("java/util/AbstractList"),
interfaces: vec![],
interfaces: vec!["java/lang/Cloneable", "java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<init>", "()V", Self::init, Default::default()),
JavaMethodProto::new("<init>", "(I)V", Self::init_with_capacity, Default::default()),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/calendar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ impl Calendar {
RuntimeClassProto {
name: "java/util/Calendar",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/io/Serializable", "java/lang/Cloneable"],
methods: vec![
JavaMethodProto::new("<init>", "()V", Self::init, Default::default()),
JavaMethodProto::new("getInstance", "()Ljava/util/Calendar;", Self::get_instance, MethodAccessFlags::STATIC),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/hash_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl HashMap {
RuntimeClassProto {
name: "java/util/HashMap",
parent_class: Some("java/util/AbstractMap"),
interfaces: vec![],
interfaces: vec!["java/lang/Cloneable", "java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<init>", "()V", Self::init, MethodAccessFlags::PUBLIC),
JavaMethodProto::new("<init>", "(I)V", Self::init_with_capacity, MethodAccessFlags::PUBLIC),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/hash_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ impl HashSet {
RuntimeClassProto {
name: "java/util/HashSet",
parent_class: Some("java/util/AbstractSet"),
interfaces: vec![],
interfaces: vec!["java/lang/Cloneable", "java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<init>", "()V", Self::init, Default::default()),
JavaMethodProto::new("<init>", "(I)V", Self::init_with_capacity, Default::default()),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/hashtable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ impl Hashtable {
RuntimeClassProto {
name: "java/util/Hashtable",
parent_class: Some("java/util/Dictionary"),
interfaces: vec!["java/util/Map"],
interfaces: vec!["java/util/Map", "java/lang/Cloneable", "java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<init>", "()V", Self::init, Default::default()),
JavaMethodProto::new("<init>", "(I)V", Self::init_with_capacity, Default::default()),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/jar/attributes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ impl Attributes {
RuntimeClassProto {
name: "java/util/jar/Attributes",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/lang/Cloneable"],
methods: vec![
JavaMethodProto::new("<init>", "()V", Self::init, Default::default()),
JavaMethodProto::new(
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/jar/manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ impl Manifest {
RuntimeClassProto {
name: "java/util/jar/Manifest",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/lang/Cloneable"],
methods: vec![
JavaMethodProto::new("<init>", "(Ljava/io/InputStream;)V", Self::init, Default::default()),
JavaMethodProto::new("read", "(Ljava/io/InputStream;)V", Self::read, Default::default()),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/logging/level.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ impl Level {
RuntimeClassProto {
name: "java/util/logging/Level",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<clinit>", "()V", Self::clinit, MethodAccessFlags::STATIC),
JavaMethodProto::new("<init>", "(Ljava/lang/String;I)V", Self::init, MethodAccessFlags::PROTECTED),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/logging/log_record.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl LogRecord {
RuntimeClassProto {
name: "java/util/logging/LogRecord",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/io/Serializable"],
methods: vec![
JavaMethodProto::new(
"<init>",
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ impl Vector {
RuntimeClassProto {
name: "java/util/Vector",
parent_class: Some("java/util/AbstractList"),
interfaces: vec!["java/util/List"],
interfaces: vec!["java/util/List", "java/lang/Cloneable", "java/io/Serializable"],
methods: vec![
JavaMethodProto::new("<init>", "()V", Self::init, Default::default()),
JavaMethodProto::new("<init>", "(I)V", Self::init_with_capacity, Default::default()),
Expand Down
2 changes: 1 addition & 1 deletion java_runtime/src/classes/java/util/zip/zip_entry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ impl ZipEntry {
RuntimeClassProto {
name: "java/util/zip/ZipEntry",
parent_class: Some("java/lang/Object"),
interfaces: vec![],
interfaces: vec!["java/lang/Cloneable"],
Comment thread
dlunch marked this conversation as resolved.
methods: vec![
JavaMethodProto::new("<init>", "(Ljava/lang/String;)V", Self::init, Default::default()),
JavaMethodProto::new("<init>", "(Ljava/util/zip/ZipEntry;)V", Self::init_with_zip_entry, Default::default()),
Expand Down
9 changes: 8 additions & 1 deletion jvm/src/jvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,14 @@ impl Jvm {
};

// load bootstrap classes
let bootstrap_classes = ["java/lang/Object", "java/lang/Runnable", "java/lang/Thread", "[B", "java/lang/Class"];
let bootstrap_classes = [
"java/lang/Object",
"java/lang/Runnable",
"java/lang/Thread",
"[B",
"java/io/Serializable",
"java/lang/Class",
];
for class_name in bootstrap_classes.iter() {
let class_definition = jvm.inner.bootstrap_class_loader.load_class(&jvm, class_name).await?.unwrap();
let class = Class::new(class_definition, None);
Expand Down