diff options
author | Archie Cobbs <archie@FreeBSD.org> | 2004-06-17 15:25:29 +0000 |
---|---|---|
committer | Archie Cobbs <archie@FreeBSD.org> | 2004-06-17 15:25:29 +0000 |
commit | 04b14f7d461286188aa8ac27567b8b3fbc55c2e2 (patch) | |
tree | 8b5f8e221b8bb4b3cee2d925b68f1fc76792cba3 /java/sablevm/files/patch-al | |
parent | Introduce the new maintainer Bjorn Lindstrom (diff) |
Upgrade to version 1.1.5.
Submitted by: Roman Kennke <roman@ontographics.com>
Notes
Notes:
svn path=/head/; revision=111670
Diffstat (limited to 'java/sablevm/files/patch-al')
-rw-r--r-- | java/sablevm/files/patch-al | 140 |
1 files changed, 0 insertions, 140 deletions
diff --git a/java/sablevm/files/patch-al b/java/sablevm/files/patch-al deleted file mode 100644 index e462ba8e1898..000000000000 --- a/java/sablevm/files/patch-al +++ /dev/null @@ -1,140 +0,0 @@ -#--- work/sablevm-1.0.6/src/libsablevm/instructions.m4.c.orig Tue Sep 10 10:35:39 2002 -#+++ work/sablevm-1.0.6/src/libsablevm/instructions.m4.c Mon Dec 16 17:28:28 2002 -#@@ -4838,10 +4838,28 @@ -# } -# -# addr[0].jint = methodref_info->method->java_args_count; -#- addr[1].offset = -#- sizeof (_svmt_vtable) + -#- (methodref_info->method->method_id * -#- sizeof (_svmt_method_info *)); -#+ -#+ /* -#+ * _svmf_resolve_CONSTANT_Methodref() may return an interface -#+ * method in certain situations (e.g., invoking an interface -#+ * method that's implemented in a subclass of an abstract class -#+ * not implementing the method but implementing the interface). -#+ */ -#+ if (_svmf_is_set_flag -#+ (methodref_info->method->class_info->access_flags, -#+ SVM_ACC_INTERFACE)) -#+ { -#+ addr[1].offset = -#+ -((1 + methodref_info->method->method_id) * -#+ sizeof (_svmt_method_info *)); -#+ } -#+ else -#+ { -#+ addr[1].offset = -#+ sizeof (_svmt_vtable) + -#+ (methodref_info->method->method_id * -#+ sizeof (_svmt_method_info *)); -#+ } -# -# /* execute bytecode */ -# { ---- work/sablevm-1.0.6/src/libsablevm/instructions_preparation_direct_threaded.c.orig Wed Oct 16 14:54:30 2002 -+++ work/sablevm-1.0.6/src/libsablevm/instructions_preparation_direct_threaded.c Mon Dec 16 17:28:29 2002 -@@ -17905,10 +17905,28 @@ - } - - addr[0].jint = methodref_info->method->java_args_count; -- addr[1].offset = -- sizeof (_svmt_vtable) + -- (methodref_info->method->method_id * -- sizeof (_svmt_method_info *)); -+ -+ /* -+ * _svmf_resolve_CONSTANT_Methodref() may return an interface -+ * method in certain situations (e.g., invoking an interface -+ * method that's implemented in a subclass of an abstract class -+ * not implementing the method but implementing the interface). -+ */ -+ if (_svmf_is_set_flag -+ (methodref_info->method->class_info->access_flags, -+ SVM_ACC_INTERFACE)) -+ { -+ addr[1].offset = -+ -((1 + methodref_info->method->method_id) * -+ sizeof (_svmt_method_info *)); -+ } -+ else -+ { -+ addr[1].offset = -+ sizeof (_svmt_vtable) + -+ (methodref_info->method->method_id * -+ sizeof (_svmt_method_info *)); -+ } - - /* execute bytecode */ - { ---- work/sablevm-1.0.6/src/libsablevm/instructions_preparation_inlined_threaded.c.orig Wed Oct 16 14:54:31 2002 -+++ work/sablevm-1.0.6/src/libsablevm/instructions_preparation_inlined_threaded.c Mon Dec 16 17:28:29 2002 -@@ -21512,10 +21512,28 @@ - } - - addr[0].jint = methodref_info->method->java_args_count; -- addr[1].offset = -- sizeof (_svmt_vtable) + -- (methodref_info->method->method_id * -- sizeof (_svmt_method_info *)); -+ -+ /* -+ * _svmf_resolve_CONSTANT_Methodref() may return an interface -+ * method in certain situations (e.g., invoking an interface -+ * method that's implemented in a subclass of an abstract class -+ * not implementing the method but implementing the interface). -+ */ -+ if (_svmf_is_set_flag -+ (methodref_info->method->class_info->access_flags, -+ SVM_ACC_INTERFACE)) -+ { -+ addr[1].offset = -+ -((1 + methodref_info->method->method_id) * -+ sizeof (_svmt_method_info *)); -+ } -+ else -+ { -+ addr[1].offset = -+ sizeof (_svmt_vtable) + -+ (methodref_info->method->method_id * -+ sizeof (_svmt_method_info *)); -+ } - - /* execute bytecode */ - { ---- work/sablevm-1.0.6/src/libsablevm/instructions_switch.c.orig Wed Oct 16 14:54:31 2002 -+++ work/sablevm-1.0.6/src/libsablevm/instructions_switch.c Mon Dec 16 17:28:29 2002 -@@ -15936,10 +15936,28 @@ - } - - addr[0].jint = methodref_info->method->java_args_count; -- addr[1].offset = -- sizeof (_svmt_vtable) + -- (methodref_info->method->method_id * -- sizeof (_svmt_method_info *)); -+ -+ /* -+ * _svmf_resolve_CONSTANT_Methodref() may return an interface -+ * method in certain situations (e.g., invoking an interface -+ * method that's implemented in a subclass of an abstract class -+ * not implementing the method but implementing the interface). -+ */ -+ if (_svmf_is_set_flag -+ (methodref_info->method->class_info->access_flags, -+ SVM_ACC_INTERFACE)) -+ { -+ addr[1].offset = -+ -((1 + methodref_info->method->method_id) * -+ sizeof (_svmt_method_info *)); -+ } -+ else -+ { -+ addr[1].offset = -+ sizeof (_svmt_vtable) + -+ (methodref_info->method->method_id * -+ sizeof (_svmt_method_info *)); -+ } - - /* execute bytecode */ - { |