Mercurial > hg > graal-compiler

changeset 11827:ff1d8605f354

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1d64bfb3f481
files src/cpu/x86/vm/graalCodeInstaller_x86.hpp src/share/vm/graal/graalCodeInstaller.cpp
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
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");
   }
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Mon Sep 30 11:16:36 2013 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Mon Sep 30 11:36:52 2013 +0200
@@ -727,7 +727,7 @@
 
   oop debug_info = CompilationResult_Call::debugInfo(site);
 
-  assert((hotspot_method ? 1 : 0) + (foreign_call ? 1 : 0) == 1, "Call site needs exactly one type");
+  assert(!!hotspot_method ^ !!foreign_call, "Call site needs exactly one type");
 
   NativeInstruction* inst = nativeInstruction_at(_instructions->start() + pc_offset);
   jint next_pc_offset = CodeInstaller::pd_next_offset(inst, pc_offset, hotspot_method);