1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
#--- 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 */
{
|
