# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1354629485 -3600
# Node ID df6a4adb2ab5cab72bf3981dd1b3d244b2751f5c
# Parent  fdba3a43483acdda0677e69c6cea4087f3adabb2
use the more compact nop instructions for alignment

diff -r fdba3a43483a -r df6a4adb2ab5 graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64AsmOptions.java
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64AsmOptions.java	Tue Dec 04 14:57:13 2012 +0100
+++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64AsmOptions.java	Tue Dec 04 14:58:05 2012 +0100
@@ -24,7 +24,7 @@
 
 public class AMD64AsmOptions {
     public static int     Atomics                       = 0;
-    public static boolean UseNormalNop                  = true;
+    public static boolean UseNormalNop                  = false;
     public static boolean UseAddressNop                 = true;
     public static boolean UseIncDec                     = false;
     public static boolean UseXmmLoadAndClearUpper       = true;
diff -r fdba3a43483a -r df6a4adb2ab5 graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java	Tue Dec 04 14:57:13 2012 +0100
+++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java	Tue Dec 04 14:58:05 2012 +0100
@@ -65,9 +65,7 @@
             // make sure that the displacement word of the call ends up word aligned
             int offset = masm.codeBuffer.position();
             offset += tasm.target.arch.getMachineCodeCallDisplacementOffset();
-            while (offset++ % tasm.target.wordSize != 0) {
-                masm.nop();
-            }
+            masm.nop(tasm.target.wordSize - offset % tasm.target.wordSize);
         }
     }