*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java	Mon Mar 20 17:39:34 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java	Mon Mar 20 17:39:34 2017

*** 33,43 ****
--- 33,43 ----
  import static java.lang.Float.floatToRawIntBits;
  import static jdk.vm.ci.code.ValueUtil.asRegister;
  import static jdk.vm.ci.code.ValueUtil.isRegister;
  import static jdk.vm.ci.code.ValueUtil.isStackSlot;
  
! import org.graalvm.compiler.asm.NumUtil;
! import org.graalvm.compiler.core.common.NumUtil;
  import org.graalvm.compiler.asm.amd64.AMD64Address;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MIOp;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
  import org.graalvm.compiler.asm.amd64.AMD64Assembler.OperandSize;
  import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;