Changeset 179890 in webkit

Timestamp:

Feb 10, 2015, 3:33:33 PM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r179187. rdar://problem/19670901

Location:

branches/safari-600.1.4.15-branch/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/ARMv7Assembler.h (modified) (1 diff)

branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-02-10  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r179187.
+
+    2015-01-27  Csaba Osztrogonác  <ossy@webkit.org>
+
+            [ARM] Typo fix after r176083
+            https://bugs.webkit.org/show_bug.cgi?id=140937
+
+            Reviewed by Anders Carlsson.
+
+            * assembler/ARMv7Assembler.h:
+            (JSC::ARMv7Assembler::ldrh):
+
 2015-02-10  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-600.1.4.15-branch/Source/JavaScriptCore/assembler/ARMv7Assembler.h

@@ -1195 +1195 @@
         ASSERT(rn != ARMRegisters::pc); // LDR (literal)
         ASSERT(imm.isUInt12());
-        ASSERT(!(imm.isUInt12() & 1));
+        ASSERT(!(imm.getUInt12() & 1));
 
         if (!((rt | rn) & 8) && imm.isUInt6())