changeset 8185:3bbdf34536bc

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 10 Mar 2013 19:51:32 +0100
parents d982f1469cba (diff) 4b11a0983557 (current diff)
children bf1c9ae73775
files graal/com.oracle.graal.amd64/src/com/oracle/graal/amd64/AMD64Address.java graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Address.java graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java graal/com.oracle.graal.ptx/src/com/oracle/graal/ptx/PTXAddress.java
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java	Fri Mar 08 16:57:46 2013 +0100
+++ b/graal/com.oracle.graal.asm.amd64/src/com/oracle/graal/asm/amd64/AMD64Assembler.java	Sun Mar 10 19:51:32 2013 +0100
@@ -439,7 +439,8 @@
     }
 
     public final void bsfq(Register dst, AMD64Address src) {
-        prefixq(src, dst);
+        emitByte(Prefix.REXW);
+        emitByte(0x0F);
         emitByte(0xBC);
         emitOperandHelper(dst, src);
     }
@@ -452,7 +453,8 @@
     }
 
     public final void bsrq(Register dst, AMD64Address src) {
-        prefixq(src, dst);
+        emitByte(Prefix.REXW);
+        emitByte(0x0F);
         emitByte(0xBD);
         emitOperandHelper(dst, src);
     }
@@ -466,6 +468,7 @@
 
     public final void bsrl(Register dst, AMD64Address src) {
         prefix(src, dst);
+        emitByte(0x0F);
         emitByte(0xBD);
         emitOperandHelper(dst, src);
     }