comparison src/cpu/x86/vm/frame_x86.inline.hpp @ 11173:6b0fd0964b87

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 31 Jul 2013 11:00:54 +0200
parents b9a918201d47 e619a2766bcc
children d8041d695d19
comparison
equal deleted inserted replaced
10912:4ea54634f03e 11173:6b0fd0964b87
270 inline jint frame::interpreter_frame_expression_stack_direction() { return -1; } 270 inline jint frame::interpreter_frame_expression_stack_direction() { return -1; }
271 271
272 272
273 // Entry frames 273 // Entry frames
274 274
275 inline JavaCallWrapper* frame::entry_frame_call_wrapper() const { 275 inline JavaCallWrapper** frame::entry_frame_call_wrapper_addr() const {
276 return (JavaCallWrapper*)at(entry_frame_call_wrapper_offset); 276 return (JavaCallWrapper**)addr_at(entry_frame_call_wrapper_offset);
277 } 277 }
278
279 278
280 // Compiled frames 279 // Compiled frames
281 280
282 inline int frame::local_offset_for_compiler(int local_index, int nof_args, int max_nof_locals, int max_nof_monitors) { 281 inline int frame::local_offset_for_compiler(int local_index, int nof_args, int max_nof_locals, int max_nof_monitors) {
283 return (nof_args - local_index + (local_index < nof_args ? 1: -1)); 282 return (nof_args - local_index + (local_index < nof_args ? 1: -1));