Modified: trunk/Source/_javascript_Core/ChangeLog (95213 => 95214)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-15 19:29:09 UTC (rev 95213)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-15 19:32:12 UTC (rev 95214)
@@ -1,3 +1,13 @@
+2011-09-15 Gavin Barraclough <barraclo...@apple.com>
+
+ Ooops, revert accidentally commited unreviewed changes.
+
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_jfalse):
+ (JSC::JIT::emit_op_jtrue):
+ * jit/JSInterfaceJIT.h:
+ * runtime/JSValue.h:
+
2011-09-15 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r95163.
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp (95213 => 95214)
--- trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2011-09-15 19:29:09 UTC (rev 95213)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes32_64.cpp 2011-09-15 19:32:12 UTC (rev 95214)
@@ -750,10 +750,8 @@
emitLoad(cond, regT1, regT0);
- Jump isBoolean = branch32(Equal, regT1, TrustedImm32(JSValue::BooleanTag));
- addSlowCase(branch32(NotEqual, regT1, TrustedImm32(JSValue::Int32Tag)));
- isBoolean.link(this);
-
+ ASSERT((JSValue::BooleanTag + 1 == JSValue::Int32Tag) && !(JSValue::Int32Tag + 1));
+ addSlowCase(branch32(Below, regT1, TrustedImm32(JSValue::BooleanTag)));
addJump(branchTest32(Zero, regT0), target);
}
@@ -788,10 +786,8 @@
emitLoad(cond, regT1, regT0);
- Jump isBoolean = branch32(Equal, regT1, TrustedImm32(JSValue::BooleanTag));
- addSlowCase(branch32(NotEqual, regT1, TrustedImm32(JSValue::Int32Tag)));
- isBoolean.link(this);
-
+ ASSERT((JSValue::BooleanTag + 1 == JSValue::Int32Tag) && !(JSValue::Int32Tag + 1));
+ addSlowCase(branch32(Below, regT1, TrustedImm32(JSValue::BooleanTag)));
addJump(branchTest32(NonZero, regT0), target);
}
Modified: trunk/Source/_javascript_Core/jit/JSInterfaceJIT.h (95213 => 95214)
--- trunk/Source/_javascript_Core/jit/JSInterfaceJIT.h 2011-09-15 19:29:09 UTC (rev 95213)
+++ trunk/Source/_javascript_Core/jit/JSInterfaceJIT.h 2011-09-15 19:32:12 UTC (rev 95214)
@@ -188,7 +188,7 @@
#if USE(JSVALUE32_64)
// Can't just propogate JSValue::Int32Tag as visual studio doesn't like it
- static const unsigned Int32Tag = 0xfffffffe;
+ static const unsigned Int32Tag = 0xffffffff;
COMPILE_ASSERT(Int32Tag == JSValue::Int32Tag, Int32Tag_out_of_sync);
#else
static const unsigned Int32Tag = TagTypeNumber >> 32;
Modified: trunk/Source/_javascript_Core/runtime/JSValue.h (95213 => 95214)
--- trunk/Source/_javascript_Core/runtime/JSValue.h 2011-09-15 19:29:09 UTC (rev 95213)
+++ trunk/Source/_javascript_Core/runtime/JSValue.h 2011-09-15 19:32:12 UTC (rev 95214)
@@ -258,16 +258,15 @@
* cell, integer and bool values the lower 32 bits (the 'payload') contain the pointer
* integer or boolean value; in the case of all other tags the payload is 0.
*/
- enum { CellTag = 0xffffffff };
- enum { Int32Tag = 0xfffffffe };
- enum { BooleanTag = 0xfffffff4 };
- enum { NullTag = 0xfffffff3 };
- enum { UndefinedTag = 0xfffffff2 };
- enum { EmptyValueTag = 0xfffffff1 };
- enum { DeletedValueTag = 0xfffffff0 };
+ enum { Int32Tag = 0xffffffff };
+ enum { BooleanTag = 0xfffffffe };
+ enum { NullTag = 0xfffffffd };
+ enum { UndefinedTag = 0xfffffffc };
+ enum { CellTag = 0xfffffffb };
+ enum { EmptyValueTag = 0xfffffffa };
+ enum { DeletedValueTag = 0xfffffff9 };
- enum { LowestTag = DeletedValueTag };
- enum { LowestInt32OrCellTag = Int32Tag };
+ enum { LowestTag = DeletedValueTag };
uint32_t tag() const;
int32_t payload() const;
