Mercurial > hg > truffle
diff src/cpu/x86/vm/graalCodeInstaller_x86.hpp @ 11827:ff1d8605f354
graal code installer: minor style cleanup
author | Bernhard Urban <bernhard.urban@jku.at> |
---|---|
date | Mon, 30 Sep 2013 11:36:52 +0200 |
parents | 2d3d3d36ab3c |
children | 04a87dc2cfca |
line wrap: on
line diff
--- a/src/cpu/x86/vm/graalCodeInstaller_x86.hpp Mon Sep 30 11:16:36 2013 +0200 +++ b/src/cpu/x86/vm/graalCodeInstaller_x86.hpp Mon Sep 30 11:36:52 2013 +0200 @@ -148,25 +148,26 @@ } inline void CodeInstaller::pd_relocate_ForeignCall(NativeInstruction* inst, jlong foreign_call_destination) { + address pc = (address) inst; if (inst->is_call()) { // NOTE: for call without a mov, the offset must fit a 32-bit immediate // see also CompilerToVM.getMaxCallTargetOffset() - NativeCall* call = nativeCall_at((address) (inst)); + NativeCall* call = nativeCall_at(pc); call->set_destination((address) foreign_call_destination); _instructions->relocate(call->instruction_address(), runtime_call_Relocation::spec(), Assembler::call32_operand); } else if (inst->is_mov_literal64()) { - NativeMovConstReg* mov = nativeMovConstReg_at((address) (inst)); + NativeMovConstReg* mov = nativeMovConstReg_at(pc); mov->set_data((intptr_t) foreign_call_destination); _instructions->relocate(mov->instruction_address(), runtime_call_Relocation::spec(), Assembler::imm_operand); } else if (inst->is_jump()) { - NativeJump* jump = nativeJump_at((address) (inst)); + NativeJump* jump = nativeJump_at(pc); jump->set_jump_destination((address) foreign_call_destination); _instructions->relocate(jump->instruction_address(), runtime_call_Relocation::spec(), Assembler::call32_operand); } else if (inst->is_cond_jump()) { - address old_dest = nativeGeneralJump_at((address) (inst))->jump_destination(); - address disp = Assembler::locate_operand((address) (inst), Assembler::call32_operand); + address old_dest = nativeGeneralJump_at(pc)->jump_destination(); + address disp = Assembler::locate_operand(pc, Assembler::call32_operand); *(jint*) disp += ((address) foreign_call_destination) - old_dest; - _instructions->relocate((address) (inst), runtime_call_Relocation::spec(), Assembler::call32_operand); + _instructions->relocate(pc, runtime_call_Relocation::spec(), Assembler::call32_operand); } else { fatal("unsupported relocation for foreign call"); }