You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by mc...@apache.org on 2008/03/28 16:11:17 UTC
svn commit: r642252 [2/2] - in /harmony/enhanced/drlvm/trunk/vm: em/src/
include/ include/open/ interpreter/src/ jitrino/src/jet/
jitrino/src/optimizer/ jitrino/src/translator/java/ jitrino/src/vm/
thread/src/ vmcore/build/ vmcore/include/ vmcore/src/c...
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp Fri Mar 28 08:11:03 2008
@@ -25,9 +25,10 @@
#define DYNAMIC_OPEN
#include "VMInterface.h"
#include "open/vm_class_info.h"
-#include "open/vm_interface.h"
#include "open/vm_type_access.h"
#include "open/vm_field_access.h"
+#include "open/vm_method_access.h"
+#include "open/vm_interface.h"
#include "jit_import_rt.h"
#include "jit_runtime_support.h"
@@ -107,25 +108,25 @@
//Method
-static method_get_overridden_method_t method_get_overridden_method = 0;//method_find_overridden_method
+static method_get_overriding_method_t method_get_overriding_method = 0;
static method_get_info_block_jit_t method_get_info_block_jit = 0;
static method_get_info_block_size_jit_t method_get_info_block_size_jit = 0;
static method_get_name_t method_get_name = 0;
static method_get_descriptor_t method_get_descriptor = 0;
-static method_get_byte_code_addr_t method_get_byte_code_addr = 0;
-static method_get_byte_code_size_t method_get_byte_code_size = 0;
+static method_get_bytecode_t method_get_bytecode = 0;
+static method_get_bytecode_length_t method_get_bytecode_length = 0;
static method_get_max_stack_t method_get_max_stack = 0;
-static method_get_num_handlers_t method_get_num_handlers = 0;
+static method_get_exc_handler_number_t method_get_exc_handler_number = 0;
static method_get_offset_t method_get_offset = 0;
static method_get_indirect_address_t method_get_indirect_address = 0;
static method_get_native_func_addr_t method_get_native_func_addr = 0;
-static method_vars_get_number_t method_vars_get_number = 0;
+static method_get_max_locals_t method_get_max_locals = 0;
static method_args_get_number_t method_args_get_number = 0;
static method_args_get_type_info_t method_args_get_type_info = 0;
static method_ret_type_get_type_info_t method_ret_type_get_type_info = 0;
static method_get_signature_t method_get_signature = 0;
static method_get_class_t method_get_class = 0;
-static method_get_handler_info_t method_get_handler_info = 0;
+static method_get_exc_handler_info_t method_get_exc_handler_info = 0;
static method_get_code_block_addr_jit_new_t method_get_code_block_addr_jit_new = 0;
static method_get_code_block_size_jit_new_t method_get_code_block_size_jit_new = 0;
static method_get_side_effects_t method_get_side_effects = 0;
@@ -301,25 +302,25 @@
//Method
- method_get_overridden_method = GET_INTERFACE(vm, method_get_overridden_method);
+ method_get_overriding_method = GET_INTERFACE(vm, method_get_overriding_method);
method_get_info_block_jit = GET_INTERFACE(vm, method_get_info_block_jit);
method_get_info_block_size_jit = GET_INTERFACE(vm, method_get_info_block_size_jit);
method_get_name = GET_INTERFACE(vm, method_get_name);
method_get_descriptor = GET_INTERFACE(vm, method_get_descriptor);
- method_get_byte_code_addr = GET_INTERFACE(vm, method_get_byte_code_addr);
- method_get_byte_code_size = GET_INTERFACE(vm, method_get_byte_code_size);
+ method_get_bytecode = GET_INTERFACE(vm, method_get_bytecode);
+ method_get_bytecode_length = GET_INTERFACE(vm, method_get_bytecode_length);
method_get_max_stack = GET_INTERFACE(vm, method_get_max_stack);
- method_get_num_handlers = GET_INTERFACE(vm, method_get_num_handlers);
+ method_get_exc_handler_number = GET_INTERFACE(vm, method_get_exc_handler_number);
method_get_offset = GET_INTERFACE(vm, method_get_offset);
method_get_indirect_address = GET_INTERFACE(vm, method_get_indirect_address);
method_get_native_func_addr = GET_INTERFACE(vm, method_get_native_func_addr);
- method_vars_get_number = GET_INTERFACE(vm, method_vars_get_number);
+ method_get_max_locals = GET_INTERFACE(vm, method_get_max_locals);
method_args_get_number = GET_INTERFACE(vm, method_args_get_number);
method_args_get_type_info = GET_INTERFACE(vm, method_args_get_type_info);
method_ret_type_get_type_info = GET_INTERFACE(vm, method_ret_type_get_type_info);
method_get_signature = GET_INTERFACE(vm, method_get_signature);
method_get_class = GET_INTERFACE(vm, method_get_class);
- method_get_handler_info = GET_INTERFACE(vm, method_get_handler_info);
+ method_get_exc_handler_info = GET_INTERFACE(vm, method_get_exc_handler_info);
method_get_code_block_addr_jit_new = GET_INTERFACE(vm, method_get_code_block_addr_jit_new);
method_get_code_block_size_jit_new = GET_INTERFACE(vm, method_get_code_block_size_jit_new);
method_get_side_effects = GET_INTERFACE(vm, method_get_side_effects);
@@ -709,16 +710,16 @@
// Method info
//
-const Byte* MethodDesc::getByteCodes() const {return method_get_byte_code_addr(drlMethod);}
-uint32 MethodDesc::getByteCodeSize() const {return (uint32) method_get_byte_code_size(drlMethod);}
+const Byte* MethodDesc::getByteCodes() const {return method_get_bytecode(drlMethod);}
+uint32 MethodDesc::getByteCodeSize() const {return (uint32) method_get_bytecode_length(drlMethod);}
uint16 MethodDesc::getMaxStack() const {return (uint16) method_get_max_stack(drlMethod);}
-uint32 MethodDesc::getNumHandlers() const {return method_get_num_handlers(drlMethod);}
+uint32 MethodDesc::getNumHandlers() const {return method_get_exc_handler_number(drlMethod);}
bool MethodDesc::isOverridden() const {return method_is_overridden(drlMethod)?true:false;}
uint32 MethodDesc::getOffset() const {return method_get_offset(drlMethod);}
void* MethodDesc::getIndirectAddress() const {return method_get_indirect_address(drlMethod);}
void* MethodDesc::getNativeAddress() const {return method_get_native_func_addr(drlMethod);}
-uint32 MethodDesc::getNumVars() const {return method_vars_get_number(drlMethod);}
+uint32 MethodDesc::getNumVars() const {return method_get_max_locals(drlMethod);}
uint32
MethodDesc::getNumParams() const {
@@ -742,7 +743,7 @@
}
void MethodDesc::getHandlerInfo(unsigned index, unsigned* beginOffset, unsigned* endOffset, unsigned* handlerOffset, unsigned* handlerClassIndex) const {
- method_get_handler_info(drlMethod,index,beginOffset,endOffset,handlerOffset,handlerClassIndex);
+ method_get_exc_handler_info(drlMethod,index,beginOffset,endOffset,handlerOffset,handlerClassIndex);
}
// accessors for method info, code and data
@@ -1017,11 +1018,11 @@
}
MethodDesc*
-CompilationInterface::getOverriddenMethod(NamedType* type, MethodDesc *methodDesc) {
+CompilationInterface::getOverridingMethod(NamedType* type, MethodDesc *methodDesc) {
if (type->isUnresolvedType()) {
return NULL;
}
- Method_Handle m = method_get_overridden_method((Class_Handle) type->getVMTypeHandle(),
+ Method_Handle m = method_get_overriding_method((Class_Handle) type->getVMTypeHandle(),
methodDesc->getMethodHandle());
if (!m)
return NULL;
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h Fri Mar 28 08:11:03 2008
@@ -341,7 +341,7 @@
// Class type is a subclass of ch=mh->getParentType() The function returns
// a method description for a method overriding mh in type or in the closest
// superclass of ch that overrides mh.
- MethodDesc* getOverriddenMethod(NamedType *type, MethodDesc * methodDesc);
+ MethodDesc* getOverridingMethod(NamedType *type, MethodDesc * methodDesc);
const void* getStringInternAddr(MethodDesc* enclosingMethodDesc, uint32 stringToken);
Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c Fri Mar 28 08:11:03 2008
@@ -691,7 +691,7 @@
new_thread->mutex = mutex;
new_thread->monitor = monitor;
}
- assert(new_thread->os_handle == NULL);
+ assert(new_thread->os_handle == 0);
new_thread->java_status = jstatus;
new_thread->priority = HYTHREAD_PRIORITY_NORMAL;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/build/vmcore.exp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/build/vmcore.exp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/build/vmcore.exp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/build/vmcore.exp Fri Mar 28 08:11:03 2008
@@ -104,7 +104,6 @@
field_get_track_modification_flag;
field_get_type;
field_get_type_info;
- field_is_enumerable_reference;
field_is_final;
field_is_injected;
field_is_literal;
@@ -484,70 +483,50 @@
method_allocate_jit_data_block;
method_args_get_number;
method_args_get_type_info;
- method_args_has_this;
- method_args_is_managed_pointer;
- method_find_overridden_method;
+ method_get_overriding_method;
method_get_argument_list;
- method_get_byte_code_addr;
- method_get_byte_code_size;
+ method_get_bytecode;
+ method_get_bytecode_length;
method_get_class;
- method_get_code_block_addr_jit;
- method_get_code_block_addr_jit_new;
+ method_get_code_block_jit;
method_get_code_block_size_jit;
+ method_get_code_block_addr_jit_new;
method_get_code_block_size_jit_new;
method_get_descriptor;
- method_get_first_method_jit;
- method_get_flags;
- method_get_handler_info;
+ method_get_exc_handler_info;
method_get_indirect_address;
method_get_info_block_jit;
method_get_info_block_size_jit;
method_get_JIT_id;
method_get_max_locals;
method_get_max_stack;
- method_get_method_jit;
method_get_name;
method_get_native_func_addr;
- method_get_next_method_jit;
- method_get_num_handlers;
+ method_get_exc_handler_number;
method_get_offset;
method_get_return_type;
- method_get_return_type_class;
method_get_side_effects;
method_get_signature;
- method_get_throws;
method_has_annotation;
method_is_abstract;
- method_is_fake;
method_is_final;
method_is_java;
method_is_native;
method_is_no_inlining;
method_is_overridden;
method_is_private;
- method_is_public;
method_is_require_security_object;
method_is_static;
method_is_strict;
method_is_synchronized;
- method_iterator_advance;
- method_iterator_get_current;
- method_iterator_initialize;
method_lock;
- method_number_throws;
method_ret_type_get_type_info;
- method_ret_type_is_managed_pointer;
method_set_inline_assumption;
method_set_num_target_handlers;
- method_set_relocatable;
method_set_side_effects;
method_set_target_handler_info;
method_unlock;
method_uses_fastcall;
- method_vars_get_number;
- method_vars_get_type_info;
- method_vars_is_managed_pointer;
- method_vars_is_pinned;
object_get_vtable_offset;
port_atomic_cas64;
port_vmem_page_sizes;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_interface.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_interface.h?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_interface.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_interface.h Fri Mar 28 08:11:03 2008
@@ -388,7 +388,7 @@
* @note Assertion is raised if method is equal to null.
*/
unsigned
-method_get_code_length( method_handler method );
+method_get_bytecode_length( method_handler method );
/**
* Function returns method bytecode array.
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h Fri Mar 28 08:11:03 2008
@@ -292,18 +292,18 @@
class Handler {
public:
Handler();
- bool parse(Class* clss, unsigned code_length, ByteReader &cfs, Method* method);
- uint32 get_start_pc() {return _start_pc;}
- uint32 get_end_pc() {return _end_pc;}
- uint32 get_handler_pc() {return _handler_pc;}
- uint32 get_catch_type_index() {return _catch_type_index;}
+ bool parse(Class* clss, unsigned code_length, ByteReader& cfs, Method* method);
+ uint16 get_start_pc() {return _start_pc;}
+ uint16 get_end_pc() {return _end_pc;}
+ uint16 get_handler_pc() {return _handler_pc;}
+ uint16 get_catch_type_index() {return _catch_type_index;}
private:
- uint32 _start_pc;
- uint32 _end_pc;
- uint32 _handler_pc;
- uint32 _catch_type_index;
- String *_catch_type;
+ uint16 _start_pc;
+ uint16 _end_pc;
+ uint16 _handler_pc;
+ uint16 _catch_type_index;
+ String* _catch_type;
}; //Handler
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp Fri Mar 28 08:11:03 2008
@@ -40,6 +40,7 @@
#include "open/vm_type_access.h"
#include "open/vm_field_access.h"
+#include "open/vm_method_access.h"
#include "open/vm_class_info.h"
#include "jit_intf.h"
@@ -98,9 +99,9 @@
return cl->get_package()->get_name()->bytes;
}
-Boolean method_is_abstract(Method_Handle m) {
+BOOLEAN method_is_abstract(Method_Handle m) {
assert(m);
- return ((Method*)m)->is_abstract();
+ return m->is_abstract();
} // method_is_abstract
@@ -212,56 +213,49 @@
return f->get_track_modification_flag(address, mask);
}
-Boolean method_is_static(Method_Handle m)
+BOOLEAN method_is_static(Method_Handle m)
{
assert(m);
- return ((Method *)m)->is_static();
-}
-
-
-Boolean method_is_final(Method_Handle m)
-{
- assert(m);
- return ((Method *)m)->is_final();
-}
+ return m->is_static();
+} // method_is_static
-Boolean method_is_synchronized(Method_Handle m)
+BOOLEAN method_is_final(Method_Handle m)
{
assert(m);
- return ((Method *)m)->is_synchronized();
-} //method_is_synchronized
+ return m->is_final();
+} // method_is_final
-Boolean method_is_private(Method_Handle m)
+BOOLEAN method_is_synchronized(Method_Handle m)
{
assert(m);
- return ((Method *)m)->is_private();
-} //method_is_private
+ return m->is_synchronized();
+} // method_is_synchronized
-Boolean method_is_public(Method_Handle m)
+BOOLEAN method_is_private(Method_Handle m)
{
assert(m);
- return ((Method *)m)->is_public();
-}
+ return m->is_private();
+} // method_is_private
-Boolean method_is_strict(Method_Handle m)
+BOOLEAN method_is_strict(Method_Handle m)
{
assert(m);
- return ((Method *)m)->is_strict();
+ return m->is_strict();
} // method_is_strict
-Boolean method_is_native(Method_Handle m)
+BOOLEAN method_is_native(Method_Handle m)
{
assert(m);
- return ((Method *)m)->is_native();
+ return m->is_native();
} // method_is_native
-Byte *method_allocate_info_block(Method_Handle m, JIT_Handle j, size_t size)
+Byte* method_allocate_info_block(Method_Handle m, JIT_Handle j, size_t size)
{
assert(m);
return (Byte *)((Method *)m)->allocate_jit_info_block(size, (JIT *)j);
@@ -337,25 +331,7 @@
} // method_allocate_code_block
-
-void method_set_relocatable(Method_Handle m, JIT_Handle j, NativeCodePtr code_address, Boolean is_relocatable)
-{
- Global_Env *env = VM_Global_State::loader_env;
- CodeChunkInfo *cci;
- Method_Handle method = env->em_interface->LookupCodeChunk(code_address, FALSE,
- NULL, NULL, reinterpret_cast<void **>(&cci));
- assert(method);
- assert(method == m);
- assert(cci);
- assert(cci->get_jit() == j);
- assert(cci->get_method() == m);
- cci->set_relocatable(is_relocatable);
-} //method_set_relocatable
-
-
-
-
-Byte *method_get_code_block_addr_jit(Method_Handle m, JIT_Handle j)
+Byte* method_get_code_block_jit(Method_Handle m, JIT_Handle j)
{
assert(m);
return method_get_code_block_addr_jit_new(m, j, 0);
@@ -376,9 +352,9 @@
int id)
{
assert(method);
- CodeChunkInfo *jit_info = ((Method *)method)->get_chunk_info_no_create_mt((JIT *)j, id);
+ CodeChunkInfo* jit_info = method->get_chunk_info_no_create_mt((JIT *)j, id);
assert(jit_info);
- return (Byte *)jit_info->get_code_block_addr();
+ return (Byte*)jit_info->get_code_block_addr();
} //method_get_code_block_addr_jit_new
@@ -393,65 +369,55 @@
} //method_get_code_block_size_jit_new
-const Byte *method_get_byte_code_addr(Method_Handle m)
+const Byte* method_get_bytecode(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_byte_code_addr();
+ return m->get_byte_code_addr();
}
-size_t method_get_byte_code_size(Method_Handle m)
+uint32
+method_get_bytecode_length(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_byte_code_size();
+ return m->get_byte_code_size();
}
-unsigned method_get_max_locals(Method_Handle m)
+uint32 method_get_max_locals(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_max_locals();
-}
-
-
-
-unsigned method_get_max_stack(Method_Handle m)
-{
- assert(m);
- return ((Method *)m)->get_max_stack();
+ return m->get_max_locals();
}
-
-unsigned method_get_flags(Method_Handle m)
+uint16 method_get_max_stack(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_access_flags();
+ return m->get_max_stack();
}
-
unsigned method_get_offset(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_offset();
+ return m->get_offset();
}
-
void *method_get_indirect_address(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_indirect_address();
+ return m->get_indirect_address();
} //method_get_indirect_address
const char *
method_get_name(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_name()->bytes;
+ return m->get_name()->bytes;
}
@@ -459,7 +425,7 @@
const char* method_get_descriptor(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_descriptor()->bytes;
+ return m->get_descriptor()->bytes;
}
@@ -467,43 +433,35 @@
Class_Handle method_get_class(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_class();
+ return m->get_class();
}
void method_lock(Method_Handle m)
{
assert(m);
- return ((Method *)m)->lock();
+ return m->lock();
}
void method_unlock(Method_Handle m)
{
assert(m);
- return ((Method *)m)->unlock();
+ return m->unlock();
}
Java_Type method_get_return_type(Method_Handle m)
{
assert(m);
- return ((Method *)m)->get_return_java_type();
+ return m->get_return_java_type();
}
-Boolean method_is_overridden(Method_Handle m)
+BOOLEAN method_is_overridden(Method_Handle m)
{
assert(m);
- return ((Method *)m)->is_overridden();
-} //method_is_overridden
-
-
-Boolean method_is_fake(Method_Handle m)
-{
- assert(m);
- return ((Method *)m)->is_fake_method();
-} //method_is_fake
-
+ return m->is_overridden();
+} // method_is_overridden
JIT_Handle method_get_JIT_id(Compile_Handle h)
@@ -1184,12 +1142,6 @@
} // class_cp_get_class_name
-unsigned method_number_throws(Method_Handle m)
-{
- assert(m);
- return ((Method*)m)->num_exceptions_method_can_throw();
-}
-
Class_Handle method_get_throws(Method_Handle mh, unsigned idx)
{
assert(hythread_is_suspend_enabled());
@@ -1205,23 +1157,23 @@
return c;
}
-unsigned method_get_num_handlers(Method_Handle m)
+
+uint16 method_get_exc_handler_number(Method_Handle m)
{
assert(m);
- return ((Method *)m)->num_bc_exception_handlers();
-} //method_get_num_handlers
-
+ return m->num_bc_exception_handlers();
+} // method_get_exc_handler_number
-void method_get_handler_info(Method_Handle m,
- unsigned handler_id,
- unsigned *begin_offset,
- unsigned *end_offset,
- unsigned *handler_offset,
- unsigned *handler_cpindex)
+void method_get_exc_handler_info(Method_Handle m,
+ uint32 handler_id,
+ uint32* begin_offset,
+ uint32* end_offset,
+ uint32* handler_offset,
+ uint32* handler_cpindex)
{
assert(m);
- Handler *h = ((Method *)m)->get_bc_exception_handler_info(handler_id);
+ Handler* h = m->get_bc_exception_handler_info(handler_id);
*begin_offset = h->get_start_pc();
*end_offset = h->get_end_pc();
*handler_offset = h->get_handler_pc();
@@ -1306,9 +1258,6 @@
// begin declarations
-// Returns the number of local variables defined for the method.
-VMEXPORT unsigned method_vars_get_number(Method_Handle mh);
-
VMEXPORT Class_Handle class_get_class_of_primitive_type(VM_Data_Type ch);
////////////////////////////////////////////////////////////
@@ -1527,18 +1476,9 @@
} //class_get_primitive_type_of_class
-unsigned method_vars_get_number(Method_Handle mh)
-{
- assert(mh);
- Method *m = (Method *)mh;
- return m->get_max_locals();
-} //method_vars_get_number
-
-
-
// Returns the number of arguments defined for the method.
// This number includes the this pointer (if present).
-unsigned method_args_get_number(Method_Signature_Handle mh)
+unsigned char method_args_get_number(Method_Signature_Handle mh)
{
assert(mh);
Method_Signature *ms = (Method_Signature *)mh;
@@ -1546,7 +1486,7 @@
Method *m = ms->method;
assert(m);
return m->get_num_args();
-} //method_args_get_number
+} // method_args_get_number
// 20020303 At the moment we resolve the return type eagerly, but
@@ -1630,17 +1570,7 @@
m->set_method_sig(ms);
}
return ms;
-} //method_get_signature
-
-
-
-
-Boolean method_args_has_this(Method_Signature_Handle msh)
-{
- assert(msh);
- Method_Signature *ms = (Method_Signature *)msh;
- return !ms->method->is_static();
-} //method_args_has_this
+} // method_get_signature
unsigned class_number_fields(Class_Handle ch)
@@ -1808,19 +1738,6 @@
/////////////////////////////////////////////////////////////////////
// New signature stuff
-
-
-
-Type_Info_Handle method_vars_get_type_info(Method_Handle mh,
- unsigned UNREF idx)
-{
- assert(mh);
- // Always NULL for Java.
- return 0;
-} //method_vars_get_type_info
-
-
-
Type_Info_Handle method_args_get_type_info(Method_Signature_Handle msh,
unsigned idx)
{
@@ -1844,48 +1761,6 @@
} //method_ret_type_get_type_info
-
-Boolean method_vars_is_managed_pointer(Method_Handle mh, unsigned idx)
-{
- assert(mh);
- Type_Info_Handle tih = method_vars_get_type_info(mh, idx);
- TypeDesc* td = (TypeDesc*)tih;
- assert(td);
- return td->is_managed_pointer();
-} //method_vars_is_managed_pointer
-
-
-Boolean method_vars_is_pinned(Method_Handle mh, unsigned UNREF idx)
-{
- assert(mh);
- // 20030626 This is wrong, but equivalent to the existing code when I wrote this.
- return FALSE;
-} //method_vars_is_pinned
-
-
-Boolean method_args_is_managed_pointer(Method_Signature_Handle msh, unsigned idx)
-{
- assert(msh);
- Type_Info_Handle tih = method_args_get_type_info(msh, idx);
- TypeDesc* td = (TypeDesc*)tih;
- assert(td);
- return td->is_managed_pointer();
-} //method_args_is_managed_pointer
-
-
-
-Boolean method_ret_type_is_managed_pointer(Method_Signature_Handle msh)
-{
- assert(msh);
- Type_Info_Handle tih = method_ret_type_get_type_info(msh);
- TypeDesc* td = (TypeDesc*)tih;
- assert(td);
- return td->is_managed_pointer();
-} //method_ret_type_is_managed_pointer
-
-
-
-
void free_string_buffer(char *buffer)
{
STD_FREE(buffer);
@@ -2022,7 +1897,7 @@
static unsigned no_inlining_table_count = sizeof(no_inlining_table)/sizeof(no_inlining_table[0]);
-Boolean method_is_no_inlining(Method_Handle mh)
+BOOLEAN method_is_no_inlining(Method_Handle mh)
{
assert(mh);
const char* c = class_get_name(method_get_class(mh));
@@ -2034,16 +1909,7 @@
strcmp(d, no_inlining_table[i].d)==0)
return TRUE;
return FALSE;
-} //method_is_no_inlining
-
-
-
-Boolean method_is_require_security_object(Method_Handle mh)
-{
- assert(mh);
- return FALSE;
-} //method_is_require_security_object
-
+} // method_is_no_inlining
#define QUAL_NAME_BUFF_SIZE 128
@@ -2051,7 +1917,7 @@
// Class ch is a subclass of method_get_class(mh). The function returns a method handle
// for an accessible method overriding mh in ch or in its closest superclass that overrides mh.
// Class ch must be a class not an interface.
-Method_Handle method_find_overridden_method(Class_Handle ch, Method_Handle mh)
+Method_Handle method_get_overriding_method(Class_Handle ch, Method_Handle mh)
{
assert(ch);
assert(mh);
@@ -2077,7 +1943,7 @@
}
}
return m;
-} //method_find_overridden_method
+} // method_get_overriding_method
@@ -2360,76 +2226,6 @@
chaClassIterator->_current = next;
} // class_iterator_advance
-
-Boolean method_iterator_initialize(ChaMethodIterator *chaClassIterator, Method_Handle method, Class_Handle root_class)
-{
- assert(method);
- chaClassIterator->_current = NULL;
- class_iterator_initialize(&chaClassIterator->_class_iter, root_class);
- chaClassIterator->_method = method;
-
- // Don't support static methods for now, since the Signature of a method
- // doesn't distinguish between static and non-static.
- if (method_is_static(method))
- {
- return (chaClassIterator->_class_iter._is_valid = FALSE);
- }
-
- // If the root_class contains the method, then start the iteration at
- // root_class. Otherwise, advance the iterator to the first class that
- // contains the method.
- Method *m = class_lookup_method_recursive((Class *) root_class, ((Method *) method)->get_name(), ((Method *) method)->get_descriptor());
- if (m == NULL)
- {
- method_iterator_advance(chaClassIterator);
- }
- else
- {
- chaClassIterator->_current = (Method_Handle) m;
- }
-
- return chaClassIterator->_class_iter._is_valid;
-} // method_iterator_initialize
-
-
-Method_Handle method_iterator_get_current(const ChaMethodIterator *chaClassIterator)
-{
- return (chaClassIterator->_class_iter._is_valid ? chaClassIterator->_current : NULL);
-} // method_iterator_get_current
-
-
-void method_iterator_advance(ChaMethodIterator *chaClassIterator)
-{
- if (!chaClassIterator->_class_iter._is_valid)
- return;
- if (chaClassIterator->_class_iter._current == NULL)
- return;
-
- // Move the class iterator forward until a class is found that
- // implements the method, such that the method handle's class
- // is equal to the current class of the iterator.
- Method *m = (Method *) chaClassIterator->_method;
- const String *name = m->get_name();
- const String *desc = m->get_descriptor();
- while (true)
- {
- class_iterator_advance(&chaClassIterator->_class_iter);
- Class *c = (Class *) class_iterator_get_current(&chaClassIterator->_class_iter);
- if (c == NULL)
- {
- chaClassIterator->_current = NULL;
- return;
- }
- Method *next = c->lookup_method(name, desc);
- if (next != NULL && next->get_class() == c)
- {
- chaClassIterator->_current = (Method_Handle) next;
- return;
- }
- }
-} // method_iterator_advance
-
-
CallingConvention vm_managed_calling_convention()
{
return CC_Vm;
@@ -2668,7 +2464,7 @@
}
-Boolean method_has_annotation(Method_Handle target, Class_Handle antn_type) {
+BOOLEAN method_has_annotation(Method_Handle target, Class_Handle antn_type) {
assert(target);
assert(antn_type);
if (target->get_declared_annotations()) {
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp Fri Mar 28 08:11:03 2008
@@ -393,12 +393,12 @@
* Function returns method code length.
*/
unsigned
-method_get_code_length( method_handler hmethod )
+method_get_bytecode_length( method_handler hmethod )
{
assert( hmethod );
Method *method = (Method*)hmethod;
return method->get_byte_code_size();
-} // method_get_code_length
+} // method_get_bytecode_length
/**
* Function returns method bytecode array.
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp Fri Mar 28 08:11:03 2008
@@ -25,6 +25,7 @@
#include <sstream>
+#include "open/vm_method_access.h"
#include "classloader.h"
#include "object_layout.h"
#include "String_Pool.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp Fri Mar 28 08:11:03 2008
@@ -107,7 +107,7 @@
return iter;
} //advance_arg_iterator
-Class_Handle method_get_return_type_class(Method_Handle m)
+static Class_Handle method_get_return_type_class(Method_Handle m)
{
assert(hythread_is_suspend_enabled());
Method *method = (Method *)m;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp Fri Mar 28 08:11:03 2008
@@ -30,6 +30,7 @@
#include "m2n.h"
#include "open/vm_util.h"
#include "open/gc.h"
+#include "open/vm_method_access.h"
#include "finalize.h"
#include "cci.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Fri Mar 28 08:11:03 2008
@@ -154,8 +154,6 @@
return (void*)class_hint_is_exceptiontype;
} else if (strcmp(func_name,"class_is_abstract") == 0) {
return (void*)class_is_abstract;
- } else if (strcmp(func_name,"method_get_overridden_method") == 0) {
- return (void*)method_find_overridden_method;
} else if (strcmp(func_name,"vector_get_first_element_offset") == 0) {
return (void*)vector_first_element_offset_class_handle;
} else if (strcmp(func_name,"vector_get_length_offset") == 0) {
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp Fri Mar 28 08:11:03 2008
@@ -23,6 +23,7 @@
#include "vm_log.h"
#include "open/vm_type_access.h"
+#include "open/vm_method_access.h"
#include "apr_strings.h"
#include "lock_manager.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_method.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_method.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_method.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_method.cpp Fri Mar 28 08:11:03 2008
@@ -38,6 +38,7 @@
#include "ini.h"
#include "nogc.h"
+#include "open/vm_method_access.h"
static Method* lookup_method_init(Class* clss, const char* descr)
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp Fri Mar 28 08:11:03 2008
@@ -23,6 +23,7 @@
#define LOG_DOMAIN "jni"
#include "cxxlog.h"
+#include "open/vm_method_access.h"
#include "Class.h"
#include "classloader.h"
#include "ini.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break.cpp Fri Mar 28 08:11:03 2008
@@ -22,6 +22,7 @@
* JVMTI API for working with breakpoints
*/
+#include "open/vm_method_access.h"
#include "jvmti_direct.h"
#include "jvmti_utils.h"
#include "jvmti_internal.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp Fri Mar 28 08:11:03 2008
@@ -24,6 +24,8 @@
*/
#include "cxxlog.h"
+
+#include "open/vm_method_access.h"
#include "environment.h"
#include "interpreter.h"
#include "interpreter_exports.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp Fri Mar 28 08:11:03 2008
@@ -26,6 +26,7 @@
#include "cxxlog.h"
#include "port_mutex.h"
+#include "open/vm_method_access.h"
#include "open/gc.h"
#include "jvmti_direct.h"
#include "jvmti_internal.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp Fri Mar 28 08:11:03 2008
@@ -23,6 +23,7 @@
*/
#include <string.h>
+#include "open/vm_method_access.h"
#include "Class.h"
#include "vm_strings.h"
#include "jvmti_direct.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp Fri Mar 28 08:11:03 2008
@@ -23,6 +23,7 @@
#include "jvmti_direct.h"
#include "jvmti_interface.h"
+#include "open/vm_method_access.h"
#include "exceptions.h"
#include "environment.h"
#include "open/jthread.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp Fri Mar 28 08:11:03 2008
@@ -24,6 +24,7 @@
#define LOG_DOMAIN "jvmti.stack"
+#include "open/vm_method_access.h"
#include "jvmti_direct.h"
#include "jvmti_utils.h"
#include "interpreter_exports.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp Fri Mar 28 08:11:03 2008
@@ -31,6 +31,7 @@
#include "cci.h"
#include "open/bytecodes.h"
#include "open/jthread.h"
+#include "open/vm_method_access.h"
#include "jvmti_break_intf.h"
#include "jni_utils.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp Fri Mar 28 08:11:03 2008
@@ -32,12 +32,14 @@
#include "reflection.h"
#include "open/vm_field_access.h"
+#include "open/vm_method_access.h"
#include "environment.h"
#include "exceptions.h"
#include "vm_strings.h"
#include "primitives_support.h"
#include "jni_utils.h"
#include "Class.h"
+#include "classloader.h"
#include "java_lang_VMClassRegistry.h"
#include "java_lang_reflect_VMReflection.h"
@@ -50,7 +52,7 @@
VM_Global_State::loader_env->JavaLangClass_Class);
// Create and fill exceptions array
- int n_exceptions = method_number_throws(method);
+ int n_exceptions = method->num_exceptions_method_can_throw();
jobjectArray exceptionTypes = NewObjectArray(jenv, n_exceptions, jlc_class, NULL);
if (!exceptionTypes) {
@@ -58,9 +60,10 @@
return NULL;
}
- int i = 0;
- for (; i < n_exceptions; i++) {
- Class_Handle exclass = method_get_throws(method, i);
+ for (int i = 0; i < n_exceptions; i++) {
+ Class_Handle exclass = method->get_class()->get_class_loader()->
+ LoadVerifyAndPrepareClass(VM_Global_State::loader_env, method->get_exception_name(i));
+
if (!exclass) {
assert(exn_raised());
return NULL;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp Fri Mar 28 08:11:03 2008
@@ -28,6 +28,7 @@
#include <vector>
+#include "open/vm_method_access.h"
#include "open/jthread.h"
#include "stack_trace.h"
#include "jni_direct.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/stack_iterator_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/stack_iterator_em64t.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/stack_iterator_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/stack_iterator_em64t.cpp Fri Mar 28 08:11:03 2008
@@ -21,6 +21,7 @@
#include <string.h>
+#include "open/vm_method_access.h"
#include "environment.h"
#include "stack_iterator.h"
#include "vm_threads.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/stack_iterator_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/stack_iterator_ia32.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/stack_iterator_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/stack_iterator_ia32.cpp Fri Mar 28 08:11:03 2008
@@ -36,6 +36,7 @@
#include "dump.h"
#include "port_threadunsafe.h"
+#include "open/vm_method_access.h"
// Invariants:
// Native frames:
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp Fri Mar 28 08:11:03 2008
@@ -38,6 +38,7 @@
#include "open/types.h"
#include "open/vm.h"
#include "open/vm_type_access.h"
+#include "open/vm_method_access.h"
#include "nogc.h"
// Forward decs of local functions
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_step.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_step.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_step.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_step.cpp Fri Mar 28 08:11:03 2008
@@ -5,6 +5,7 @@
#define LOG_DOMAIN "ncai.step"
#include "cxxlog.h"
+#include "open/vm_method_access.h"
#include "suspend_checker.h"
#include "jvmti_break_intf.h"
#include "classloader.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp Fri Mar 28 08:11:03 2008
@@ -25,6 +25,7 @@
#include <sstream>
#include <assert.h>
+#include "open/vm_method_access.h"
#include "Class.h"
#include "annotations.h"
#include "jni.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/reflection.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/reflection.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/reflection.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/reflection.cpp Fri Mar 28 08:11:03 2008
@@ -33,6 +33,7 @@
#include "open/vm_type_access.h"
#include "open/vm_field_access.h"
+#include "open/vm_method_access.h"
#include "exceptions.h"
#include "heap.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp Fri Mar 28 08:11:03 2008
@@ -23,6 +23,7 @@
#include "cxxlog.h"
#include "vm_log.h"
+#include "open/vm_method_access.h"
#include "m2n.h"
#include "stack_iterator.h"
#include "stack_trace.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp Fri Mar 28 08:11:03 2008
@@ -21,6 +21,7 @@
#include "open/types.h"
#include "open/vm_type_access.h"
+#include "open/vm_method_access.h"
#include "open/vm_util.h"
#include "environment.h"
#include "encoder.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp Fri Mar 28 08:11:03 2008
@@ -34,6 +34,7 @@
#include "lock_manager.h"
#include "open/types.h"
#include "open/vm_type_access.h"
+#include "open/vm_method_access.h"
#include "Class.h"
#include "type.h"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h Fri Mar 28 08:11:03 2008
@@ -182,7 +182,7 @@
m_method = _m_method;
m_max_locals = method_get_max_local( m_method );
m_max_stack = method_get_max_stack( m_method );
- m_code_length = method_get_code_length( m_method );
+ m_code_length = method_get_bytecode_length( m_method );
m_handlecount = method_get_exc_handler_number( m_method );
m_bytecode = method_get_bytecode( m_method );
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/context_5.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/context_5.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/context_5.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/context_5.cpp Fri Mar 28 08:11:03 2008
@@ -408,7 +408,7 @@
vf_Result tcr;
//nothing to verify
- if( !method_get_code_length( method ) ) {
+ if( !method_get_bytecode_length( method ) ) {
return VF_OK;
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp Fri Mar 28 08:11:03 2008
@@ -28,7 +28,7 @@
vf_Result tcr;
//nothing to verify
- if( !method_get_code_length( method ) ) {
+ if( !method_get_bytecode_length( method ) ) {
return VF_OK;
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp?rev=642252&r1=642251&r2=642252&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp Fri Mar 28 08:11:03 2008
@@ -65,7 +65,7 @@
written_stackmap = 0;
//nothing to verify
- if( !method_get_code_length( method ) ) {
+ if( !method_get_bytecode_length( method ) ) {
return VF_OK;
}