commit 2a7a1d7808f003bea908023ebd11eb442d2fca39
author Roland Levillain <rpl@google.com> Wed Apr 29 11:12:33 2015 +0000
committer Roland Levillain <rpl@google.com> Wed Apr 29 11:12:33 2015 +0000
tree 9a74fcc5590e9f39c0019edff70cd89139fcd890
parent 9b95a057ee20e4b1ca2e9c663726482172dc9ba3

Revert "Revert "Revert "[optimizing] Improve x86 shifts"""

This reverts commit 9b95a057ee20e4b1ca2e9c663726482172dc9ba3.

Reverting this CL as it breaks libcore tests:

  org.apache.harmony.tests.java.lang.DoubleTest#test_compare
      junit.framework.AssertionFailedError: compare() -0.0 should be less 0.0
      	at junit.framework.Assert.assertTrue(Assert.java:140)
      	at org.apache.harmony.tests.java.lang.DoubleTest.test_compare(DoubleTest.java:258)
    org.apache.harmony.tests.java.lang.DoubleTest#test_compare FAIL (EXEC_FAILED)
  
  org.apache.harmony.tests.java.lang.DoubleTest#test_compareToLjava_lang_Double
      junit.framework.AssertionFailedError: Assert 2: compare() -0.0 should be less 0.0
      	at junit.framework.Assert.assertTrue(Assert.java:140)
      	at org.apache.harmony.tests.java.lang.DoubleTest.test_compareToLjava_lang_Double(DoubleTest.java:1320)
    org.apache.harmony.tests.java.lang.DoubleTest#test_compareToLjava_lang_Double FAIL (EXEC_FAILED)

Change-Id: I10f0ec8cc9495cc225fef1940b3f1a9fe87d996f

compiler/utils/x86/assembler_x86.h

diff --git a/compiler/utils/x86/assembler_x86.h b/compiler/utils/x86/assembler_x86.h
index 946c96d..7fc8ef0 100644
--- a/compiler/utils/x86/assembler_x86.h
+++ b/compiler/utils/x86/assembler_x86.h
@@ -430,20 +430,12 @@
 
   void shll(Register reg, const Immediate& imm);
   void shll(Register operand, Register shifter);
-  void shll(const Address& address, const Immediate& imm);
-  void shll(const Address& address, Register shifter);
   void shrl(Register reg, const Immediate& imm);
   void shrl(Register operand, Register shifter);
-  void shrl(const Address& address, const Immediate& imm);
-  void shrl(const Address& address, Register shifter);
   void sarl(Register reg, const Immediate& imm);
   void sarl(Register operand, Register shifter);
-  void sarl(const Address& address, const Immediate& imm);
-  void sarl(const Address& address, Register shifter);
   void shld(Register dst, Register src, Register shifter);
-  void shld(Register dst, Register src, const Immediate& imm);
   void shrd(Register dst, Register src, Register shifter);
-  void shrd(Register dst, Register src, const Immediate& imm);
 
   void negl(Register reg);
   void notl(Register reg);
@@ -628,8 +620,8 @@
   void EmitLabelLink(Label* label);
   void EmitNearLabelLink(Label* label);
 
-  void EmitGenericShift(int rm, const Operand& operand, const Immediate& imm);
-  void EmitGenericShift(int rm, const Operand& operand, Register shifter);
+  void EmitGenericShift(int rm, Register reg, const Immediate& imm);
+  void EmitGenericShift(int rm, Register operand, Register shifter);
 
   DISALLOW_COPY_AND_ASSIGN(X86Assembler);
 };