1.1 --- a/src/cpu/x86/vm/interp_masm_x86_64.hpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/cpu/x86/vm/interp_masm_x86_64.hpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -86,22 +86,22 @@ 1.4 1.5 void get_const(Register reg) { 1.6 get_method(reg); 1.7 - movptr(reg, Address(reg, methodOopDesc::const_offset())); 1.8 + movptr(reg, Address(reg, Method::const_offset())); 1.9 } 1.10 1.11 void get_constant_pool(Register reg) { 1.12 get_const(reg); 1.13 - movptr(reg, Address(reg, constMethodOopDesc::constants_offset())); 1.14 + movptr(reg, Address(reg, ConstMethod::constants_offset())); 1.15 } 1.16 1.17 void get_constant_pool_cache(Register reg) { 1.18 get_constant_pool(reg); 1.19 - movptr(reg, Address(reg, constantPoolOopDesc::cache_offset_in_bytes())); 1.20 + movptr(reg, Address(reg, ConstantPool::cache_offset_in_bytes())); 1.21 } 1.22 1.23 void get_cpool_and_tags(Register cpool, Register tags) { 1.24 get_constant_pool(cpool); 1.25 - movptr(tags, Address(cpool, constantPoolOopDesc::tags_offset_in_bytes())); 1.26 + movptr(tags, Address(cpool, ConstantPool::tags_offset_in_bytes())); 1.27 } 1.28 1.29 void get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset); 1.30 @@ -110,6 +110,9 @@ 1.31 void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2)); 1.32 void get_cache_index_at_bcp(Register index, int bcp_offset, size_t index_size = sizeof(u2)); 1.33 1.34 + // load cpool->resolved_references(index); 1.35 + void load_resolved_reference_at_index(Register result, Register index); 1.36 + 1.37 void pop_ptr(Register r = rax); 1.38 void pop_i(Register r = rax); 1.39 void pop_l(Register r = rax);