Mercurial > hg > truffle
diff src/cpu/x86/vm/interp_masm_x86_64.cpp @ 21559:be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 28 May 2015 15:36:48 +0200 |
parents | 096c224171c4 |
children |
line wrap: on
line diff
--- a/src/cpu/x86/vm/interp_masm_x86_64.cpp Wed May 27 13:43:27 2015 +0200 +++ b/src/cpu/x86/vm/interp_masm_x86_64.cpp Thu May 28 15:36:48 2015 +0200 @@ -1129,7 +1129,7 @@ bind(skip_receiver_profile); // The method data pointer needs to be updated to reflect the new target. -#ifdef GRAAL +#ifdef JVMCI if (MethodProfileWidth == 0) { update_mdp_by_constant(mdp, in_bytes(VirtualCallData::virtual_call_data_size())); } @@ -1140,7 +1140,7 @@ } } -#ifdef GRAAL +#ifdef JVMCI void InterpreterMacroAssembler::profile_called_method(Register method, Register mdp, Register reg2) { assert_different_registers(method, mdp, reg2); if (ProfileInterpreter && MethodProfileWidth > 0) { @@ -1178,17 +1178,17 @@ if (is_virtual_call) { increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset())); } -#ifdef GRAAL +#ifdef JVMCI else { increment_mdp_data_at(mdp, in_bytes(ReceiverTypeData::nonprofiled_receiver_count_offset())); } #endif } else { - bool use_non_profiled_counter = !is_virtual_call || IS_GRAAL_DEFINED; + bool use_non_profiled_counter = !is_virtual_call || IS_JVMCI_DEFINED; int non_profiled_offset = -1; if (use_non_profiled_counter) { non_profiled_offset = in_bytes(CounterData::count_offset()); - #ifdef GRAAL + #ifdef JVMCI if (!is_virtual_call) { non_profiled_offset = in_bytes(ReceiverTypeData::nonprofiled_receiver_count_offset()); }