Mercurial > hg > truffle

changeset 7218:df6a4adb2ab5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use the more compact nop instructions for alignment
author Christian Haeubl <haeubl@ssw.jku.at>
date Tue, 04 Dec 2012 14:58:05 +0100
parents fdba3a43483a
children 69b3b2695fea
files graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64AsmOptions.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Call.java
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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);
         }
     }