From de4f791e30be4e4239b381c11745ffa4d87ddb8b Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Fri, 9 Nov 2012 12:15:52 +0100
Subject: Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84
 (http://svn.webkit.org/repository/webkit/trunk@133952)

Revert back to an older snapshot that should build on ARM
---
 Source/JavaScriptCore/assembler/AbstractMacroAssembler.h  | 7 -------
 Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h | 4 ----
 Source/JavaScriptCore/assembler/X86Assembler.h            | 9 ---------
 3 files changed, 20 deletions(-)

(limited to 'Source/JavaScriptCore/assembler')

diff --git a/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h b/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
index 673031b7a..c75adb7e9 100644
--- a/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
+++ b/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
@@ -586,13 +586,6 @@ public:
 
     public:
         typedef Vector<Jump, 16> JumpVector;
-        
-        JumpList() { }
-        
-        JumpList(Jump jump)
-        {
-            append(jump);
-        }
 
         void link(AbstractMacroAssembler<AssemblerType>* masm)
         {
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
index 53cb80c21..66db26acb 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
@@ -826,15 +826,11 @@ public:
             m_assembler.ucomisd_rr(right, left);
 
         if (cond == DoubleEqual) {
-            if (left == right)
-                return Jump(m_assembler.jnp());
             Jump isUnordered(m_assembler.jp());
             Jump result = Jump(m_assembler.je());
             isUnordered.link(this);
             return result;
         } else if (cond == DoubleNotEqualOrUnordered) {
-            if (left == right)
-                return Jump(m_assembler.jp());
             Jump isUnordered(m_assembler.jp());
             Jump isEqual(m_assembler.je());
             isUnordered.link(this);
diff --git a/Source/JavaScriptCore/assembler/X86Assembler.h b/Source/JavaScriptCore/assembler/X86Assembler.h
index 4d08b70ce..ecb178e88 100644
--- a/Source/JavaScriptCore/assembler/X86Assembler.h
+++ b/Source/JavaScriptCore/assembler/X86Assembler.h
@@ -1475,12 +1475,6 @@ public:
         return m_formatter.immediateRel32();
     }
 
-    AssemblerLabel jnp()
-    {
-        m_formatter.twoByteOp(jccRel32(ConditionNP));
-        return m_formatter.immediateRel32();
-    }
-
     AssemblerLabel jp()
     {
         m_formatter.twoByteOp(jccRel32(ConditionP));
@@ -2320,9 +2314,6 @@ private:
         // Format a REX prefix byte.
         inline void emitRex(bool w, int r, int x, int b)
         {
-            ASSERT(r >= 0);
-            ASSERT(x >= 0);
-            ASSERT(b >= 0);
             m_buffer.putByteUnchecked(PRE_REX | ((int)w << 3) | ((r>>3)<<2) | ((x>>3)<<1) | (b>>3));
         }
 
-- 
cgit v1.2.1