Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
21558:d563baeca9df | 21559:be896a1983c0 |
---|---|
1127 // Record the receiver type. | 1127 // Record the receiver type. |
1128 record_klass_in_profile(receiver, mdp, reg2, true); | 1128 record_klass_in_profile(receiver, mdp, reg2, true); |
1129 bind(skip_receiver_profile); | 1129 bind(skip_receiver_profile); |
1130 | 1130 |
1131 // The method data pointer needs to be updated to reflect the new target. | 1131 // The method data pointer needs to be updated to reflect the new target. |
1132 #ifdef GRAAL | 1132 #ifdef JVMCI |
1133 if (MethodProfileWidth == 0) { | 1133 if (MethodProfileWidth == 0) { |
1134 update_mdp_by_constant(mdp, in_bytes(VirtualCallData::virtual_call_data_size())); | 1134 update_mdp_by_constant(mdp, in_bytes(VirtualCallData::virtual_call_data_size())); |
1135 } | 1135 } |
1136 #else | 1136 #else |
1137 update_mdp_by_constant(mdp, in_bytes(VirtualCallData::virtual_call_data_size())); | 1137 update_mdp_by_constant(mdp, in_bytes(VirtualCallData::virtual_call_data_size())); |
1138 #endif | 1138 #endif |
1139 bind(profile_continue); | 1139 bind(profile_continue); |
1140 } | 1140 } |
1141 } | 1141 } |
1142 | 1142 |
1143 #ifdef GRAAL | 1143 #ifdef JVMCI |
1144 void InterpreterMacroAssembler::profile_called_method(Register method, Register mdp, Register reg2) { | 1144 void InterpreterMacroAssembler::profile_called_method(Register method, Register mdp, Register reg2) { |
1145 assert_different_registers(method, mdp, reg2); | 1145 assert_different_registers(method, mdp, reg2); |
1146 if (ProfileInterpreter && MethodProfileWidth > 0) { | 1146 if (ProfileInterpreter && MethodProfileWidth > 0) { |
1147 Label profile_continue; | 1147 Label profile_continue; |
1148 | 1148 |
1176 Register reg2, Label& done, bool is_virtual_call) { | 1176 Register reg2, Label& done, bool is_virtual_call) { |
1177 if (TypeProfileWidth == 0) { | 1177 if (TypeProfileWidth == 0) { |
1178 if (is_virtual_call) { | 1178 if (is_virtual_call) { |
1179 increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset())); | 1179 increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset())); |
1180 } | 1180 } |
1181 #ifdef GRAAL | 1181 #ifdef JVMCI |
1182 else { | 1182 else { |
1183 increment_mdp_data_at(mdp, in_bytes(ReceiverTypeData::nonprofiled_receiver_count_offset())); | 1183 increment_mdp_data_at(mdp, in_bytes(ReceiverTypeData::nonprofiled_receiver_count_offset())); |
1184 } | 1184 } |
1185 #endif | 1185 #endif |
1186 } else { | 1186 } else { |
1187 bool use_non_profiled_counter = !is_virtual_call || IS_GRAAL_DEFINED; | 1187 bool use_non_profiled_counter = !is_virtual_call || IS_JVMCI_DEFINED; |
1188 int non_profiled_offset = -1; | 1188 int non_profiled_offset = -1; |
1189 if (use_non_profiled_counter) { | 1189 if (use_non_profiled_counter) { |
1190 non_profiled_offset = in_bytes(CounterData::count_offset()); | 1190 non_profiled_offset = in_bytes(CounterData::count_offset()); |
1191 #ifdef GRAAL | 1191 #ifdef JVMCI |
1192 if (!is_virtual_call) { | 1192 if (!is_virtual_call) { |
1193 non_profiled_offset = in_bytes(ReceiverTypeData::nonprofiled_receiver_count_offset()); | 1193 non_profiled_offset = in_bytes(ReceiverTypeData::nonprofiled_receiver_count_offset()); |
1194 } | 1194 } |
1195 #endif | 1195 #endif |
1196 assert(non_profiled_offset >= 0, "must be"); | 1196 assert(non_profiled_offset >= 0, "must be"); |