1.1 --- a/src/cpu/x86/vm/interp_masm_x86_32.hpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/cpu/x86/vm/interp_masm_x86_32.hpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -77,10 +77,10 @@ 1.4 1.5 // Helpers for runtime call arguments/results 1.6 void get_method(Register reg) { movptr(reg, Address(rbp, frame::interpreter_frame_method_offset * wordSize)); } 1.7 - void get_const(Register reg) { get_method(reg); movptr(reg, Address(reg, methodOopDesc::const_offset())); } 1.8 - void get_constant_pool(Register reg) { get_const(reg); movptr(reg, Address(reg, constMethodOopDesc::constants_offset())); } 1.9 - void get_constant_pool_cache(Register reg) { get_constant_pool(reg); movptr(reg, Address(reg, constantPoolOopDesc::cache_offset_in_bytes())); } 1.10 - void get_cpool_and_tags(Register cpool, Register tags) { get_constant_pool(cpool); movptr(tags, Address(cpool, constantPoolOopDesc::tags_offset_in_bytes())); 1.11 + void get_const(Register reg) { get_method(reg); movptr(reg, Address(reg, Method::const_offset())); } 1.12 + void get_constant_pool(Register reg) { get_const(reg); movptr(reg, Address(reg, ConstMethod::constants_offset())); } 1.13 + void get_constant_pool_cache(Register reg) { get_constant_pool(reg); movptr(reg, Address(reg, ConstantPool::cache_offset_in_bytes())); } 1.14 + void get_cpool_and_tags(Register cpool, Register tags) { get_constant_pool(cpool); movptr(tags, Address(cpool, ConstantPool::tags_offset_in_bytes())); 1.15 } 1.16 void get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset); 1.17 void get_cache_and_index_at_bcp(Register cache, Register index, int bcp_offset, size_t index_size = sizeof(u2)); 1.18 @@ -88,6 +88,9 @@ 1.19 void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2)); 1.20 void get_cache_index_at_bcp(Register index, int bcp_offset, size_t index_size = sizeof(u2)); 1.21 1.22 + // load cpool->resolved_references(index); 1.23 + void load_resolved_reference_at_index(Register result, Register index); 1.24 + 1.25 // Expression stack 1.26 void f2ieee(); // truncate ftos to 32bits 1.27 void d2ieee(); // truncate dtos to 64bits