Signed-off-by: Tomek Grabiec <tgrab...@gmail.com>
---
vm/preload.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 112 insertions(+), 25 deletions(-)
diff --git a/vm/preload.c b/vm/preload.c
index 264d7ab..5c8a181 100644
--- a/vm/preload.c
+++ b/vm/preload.c
@@ -64,25 +64,82 @@ struct vm_class *vm_int_class;
struct vm_class *vm_long_class;
static const struct preload_entry preload_entries[] = {
- { "java/lang/Object", &vm_java_lang_Object },
- { "java/lang/Class", &vm_java_lang_Class },
- { "java/lang/String", &vm_java_lang_String },
- { "java/lang/Throwable", &vm_java_lang_Throwable },
- { "java/util/Properties", &vm_java_util_Properties },
- { "java/lang/StackTraceElement", &vm_java_lang_StackTraceElement },
- { "[Ljava/lang/StackTraceElement;",
&vm_array_of_java_lang_StackTraceElement },
- { "java/lang/VMThrowable", &vm_java_lang_VMThrowable },
- { "java/lang/ArithmeticException", &vm_java_lang_ArithmeticException },
- { "java/lang/ArrayIndexOutOfBoundsException",
&vm_java_lang_ArrayIndexOutOfBoundsException },
- { "java/lang/ArrayStoreException", &vm_java_lang_ArrayStoreException },
- { "java/lang/ClassCastException", &vm_java_lang_ClassCastException },
- { "java/lang/Error", &vm_java_lang_Error },
- { "java/lang/ExceptionInInitializerError",
&vm_java_lang_ExceptionInInitializerError },
- { "java/lang/NegativeArraySizeException",
&vm_java_lang_NegativeArraySizeException },
- { "java/lang/NoClassDefFoundError", &vm_java_lang_NoClassDefFoundError
},
- { "java/lang/NullPointerException", &vm_java_lang_NullPointerException
},
- { "java/lang/RuntimeException", &vm_java_lang_RuntimeException },
- { "java/lang/UnsatisfiedLinkError", &vm_java_lang_UnsatisfiedLinkError
},
+ {
+ "java/lang/Object",
+ &vm_java_lang_Object
+ },
+ {
+ "java/lang/Class",
+ &vm_java_lang_Class
+ },
+ {
+ "java/lang/String",
+ &vm_java_lang_String
+ },
+ {
+ "java/lang/Throwable",
+ &vm_java_lang_Throwable
+ },
+ {
+ "java/util/Properties",
+ &vm_java_util_Properties
+ },
+ {
+ "java/lang/StackTraceElement",
+ &vm_java_lang_StackTraceElement
+ },
+ {
+ "[Ljava/lang/StackTraceElement;",
+ &vm_array_of_java_lang_StackTraceElement
+ },
+ {
+ "java/lang/VMThrowable",
+ &vm_java_lang_VMThrowable
+ },
+ {
+ "java/lang/ArithmeticException",
+ &vm_java_lang_ArithmeticException
+ },
+ {
+ "java/lang/ArrayIndexOutOfBoundsException",
+ &vm_java_lang_ArrayIndexOutOfBoundsException
+ },
+ {
+ "java/lang/ArrayStoreException",
+ &vm_java_lang_ArrayStoreException
+ },
+ {
+ "java/lang/ClassCastException",
+ &vm_java_lang_ClassCastException
+ },
+ {
+ "java/lang/Error",
+ &vm_java_lang_Error
+ },
+ {
+ "java/lang/ExceptionInInitializerError",
+ &vm_java_lang_ExceptionInInitializerError
+ },
+ {
+ "java/lang/NegativeArraySizeException",
+ &vm_java_lang_NegativeArraySizeException
+ },
+ {
+ "java/lang/NoClassDefFoundError",
+ &vm_java_lang_NoClassDefFoundError
+ },
+ {
+ "java/lang/NullPointerException",
+ &vm_java_lang_NullPointerException
+ },
+ {
+ "java/lang/RuntimeException",
+ &vm_java_lang_RuntimeException
+ },
+ {
+ "java/lang/UnsatisfiedLinkError",
+ &vm_java_lang_UnsatisfiedLinkError
+ },
};
static const struct preload_entry primitive_preload_entries[] = {
@@ -111,12 +168,42 @@ struct vm_field *vm_java_lang_Throwable_detailMessage;
struct vm_field *vm_java_lang_VMThrowable_vmdata;
static const struct field_preload_entry field_preload_entries[] = {
- { &vm_java_lang_Class, "vmdata", "Ljava/lang/Object;",
&vm_java_lang_Class_vmdata },
- { &vm_java_lang_String, "offset", "I", &vm_java_lang_String_offset },
- { &vm_java_lang_String, "count", "I", &vm_java_lang_String_count },
- { &vm_java_lang_String, "value", "[C", &vm_java_lang_String_value },
- { &vm_java_lang_Throwable, "detailMessage", "Ljava/lang/String;",
&vm_java_lang_Throwable_detailMessage },
- { &vm_java_lang_VMThrowable, "vmdata", "Ljava/lang/Object;",
&vm_java_lang_VMThrowable_vmdata },
+ {
+ &vm_java_lang_Class,
+ "vmdata",
+ "Ljava/lang/Object;",
+ &vm_java_lang_Class_vmdata
+ },
+ {
+ &vm_java_lang_String,
+ "offset",
+ "I",
+ &vm_java_lang_String_offset
+ },
+ {
+ &vm_java_lang_String,
+ "count",
+ "I",
+ &vm_java_lang_String_count
+ },
+ {
+ &vm_java_lang_String,
+ "value",
+ "[C",
+ &vm_java_lang_String_value
+ },
+ {
+ &vm_java_lang_Throwable,
+ "detailMessage",
+ "Ljava/lang/String;",
+ &vm_java_lang_Throwable_detailMessage
+ },
+ {
+ &vm_java_lang_VMThrowable,
+ "vmdata",
+ "Ljava/lang/Object;",
+ &vm_java_lang_VMThrowable_vmdata
+ },
};
struct method_preload_entry {
--
1.6.0.6
------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
