Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (108306 => 108307)
--- trunk/Source/_javascript_Core/ChangeLog 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-02-21 06:34:14 UTC (rev 108307)
@@ -1,3 +1,28 @@
+2012-02-20 Filip Pizlo <[email protected]>
+
+ Unreviewed, rolling out http://trac.webkit.org/changeset/108291
+ It completely broke the 32-bit JIT.
+
+ * heap/CopiedAllocator.h:
+ * heap/CopiedSpace.h:
+ (CopiedSpace):
+ * heap/Heap.h:
+ (JSC::Heap::allocatorForObjectWithDestructor):
+ * jit/JIT.cpp:
+ (JSC::JIT::privateCompileSlowCases):
+ * jit/JIT.h:
+ (JIT):
+ * jit/JITInlineMethods.h:
+ (JSC):
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_new_array):
+ * runtime/JSArray.cpp:
+ (JSC::storageSize):
+ (JSC):
+ * runtime/JSArray.h:
+ (ArrayStorage):
+ (JSArray):
+
2012-02-20 Gavin Barraclough <[email protected]>
[[Put]] should throw if prototype chain contains a readonly property.
Modified: trunk/Source/_javascript_Core/heap/CopiedAllocator.h (108306 => 108307)
--- trunk/Source/_javascript_Core/heap/CopiedAllocator.h 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/heap/CopiedAllocator.h 2012-02-21 06:34:14 UTC (rev 108307)
@@ -31,7 +31,6 @@
namespace JSC {
class CopiedAllocator {
- friend class JIT;
public:
CopiedAllocator();
void* allocate(size_t);
Modified: trunk/Source/_javascript_Core/heap/CopiedSpace.h (108306 => 108307)
--- trunk/Source/_javascript_Core/heap/CopiedSpace.h 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/heap/CopiedSpace.h 2012-02-21 06:34:14 UTC (rev 108307)
@@ -46,7 +46,6 @@
class CopiedSpace {
friend class SlotVisitor;
- friend class JIT;
public:
CopiedSpace(Heap*);
void init();
@@ -54,8 +53,6 @@
CheckedBoolean tryAllocate(size_t, void**);
CheckedBoolean tryReallocate(void**, size_t, size_t);
- CopiedAllocator& allocator() { return m_allocator; }
-
void startedCopying();
void doneCopying();
bool isInCopyPhase() { return m_inCopyingPhase; }
Modified: trunk/Source/_javascript_Core/heap/Heap.h (108306 => 108307)
--- trunk/Source/_javascript_Core/heap/Heap.h 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/heap/Heap.h 2012-02-21 06:34:14 UTC (rev 108307)
@@ -97,7 +97,6 @@
MarkedAllocator& allocatorForObjectWithoutDestructor(size_t bytes) { return m_objectSpace.allocatorFor(bytes); }
MarkedAllocator& allocatorForObjectWithDestructor(size_t bytes) { return m_objectSpace.destructorAllocatorFor(bytes); }
- CopiedAllocator& storageAllocator() { return m_storageSpace.allocator(); }
CheckedBoolean tryAllocateStorage(size_t, void**);
CheckedBoolean tryReallocateStorage(void**, size_t, size_t);
Modified: trunk/Source/_javascript_Core/jit/JIT.cpp (108306 => 108307)
--- trunk/Source/_javascript_Core/jit/JIT.cpp 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/jit/JIT.cpp 2012-02-21 06:34:14 UTC (rev 108307)
@@ -477,7 +477,6 @@
DEFINE_SLOWCASE_OP(op_negate)
#endif
DEFINE_SLOWCASE_OP(op_neq)
- DEFINE_SLOWCASE_OP(op_new_array)
DEFINE_SLOWCASE_OP(op_new_object)
DEFINE_SLOWCASE_OP(op_new_func)
DEFINE_SLOWCASE_OP(op_new_func_exp)
Modified: trunk/Source/_javascript_Core/jit/JIT.h (108306 => 108307)
--- trunk/Source/_javascript_Core/jit/JIT.h 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/jit/JIT.h 2012-02-21 06:34:14 UTC (rev 108307)
@@ -336,10 +336,8 @@
void emitWriteBarrier(JSCell* owner, RegisterID value, RegisterID scratch, WriteBarrierMode, WriteBarrierUseKind);
template<typename ClassType, bool destructor, typename StructureType> void emitAllocateBasicJSObject(StructureType, RegisterID result, RegisterID storagePtr);
- void emitAllocateBasicStorage(size_t, RegisterID result, RegisterID storagePtr);
template<typename T> void emitAllocateJSFinalObject(T structure, RegisterID result, RegisterID storagePtr);
void emitAllocateJSFunction(FunctionExecutable*, RegisterID scopeChain, RegisterID result, RegisterID storagePtr);
- void emitAllocateJSArray(unsigned valuesRegister, unsigned length, RegisterID cellResult, RegisterID storageResult, RegisterID storagePtr);
#if ENABLE(VALUE_PROFILER)
// This assumes that the value to profile is in regT0 and that regT3 is available for
@@ -959,7 +957,7 @@
void emitSlow_op_urshift(Instruction*, Vector<SlowCaseEntry>::iterator&);
void emitSlow_op_new_func(Instruction*, Vector<SlowCaseEntry>::iterator&);
void emitSlow_op_new_func_exp(Instruction*, Vector<SlowCaseEntry>::iterator&);
- void emitSlow_op_new_array(Instruction*, Vector<SlowCaseEntry>::iterator&);
+
void emitRightShift(Instruction*, bool isUnsigned);
void emitRightShiftSlowCase(Instruction*, Vector<SlowCaseEntry>::iterator&, bool isUnsigned);
Modified: trunk/Source/_javascript_Core/jit/JITInlineMethods.h (108306 => 108307)
--- trunk/Source/_javascript_Core/jit/JITInlineMethods.h 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/jit/JITInlineMethods.h 2012-02-21 06:34:14 UTC (rev 108307)
@@ -454,65 +454,6 @@
#endif
}
-inline void JIT::emitAllocateBasicStorage(size_t size, RegisterID result, RegisterID storagePtr)
-{
- CopiedAllocator* allocator = &m_globalData->heap.storageAllocator();
-
- // FIXME: We need to check for wrap-around.
- // Check to make sure that the allocation will fit in the current block.
- loadPtr(&allocator->m_currentOffset, result);
- addPtr(TrustedImm32(size), result);
- loadPtr(&allocator->m_currentBlock, storagePtr);
- addPtr(TrustedImm32(HeapBlock::s_blockSize), storagePtr);
- addSlowCase(branchPtr(AboveOrEqual, result, storagePtr));
-
- // Load the original offset.
- loadPtr(&allocator->m_currentOffset, result);
-
- // Bump the pointer forward.
- move(result, storagePtr);
- addPtr(TrustedImm32(size), storagePtr);
- storePtr(storagePtr, &allocator->m_currentOffset);
-}
-
-inline void JIT::emitAllocateJSArray(unsigned valuesRegister, unsigned length, RegisterID cellResult, RegisterID storageResult, RegisterID storagePtr)
-{
- unsigned initialLength = std::max(length, 4U);
- size_t initialStorage = JSArray::storageSize(initialLength);
-
- // Allocate the cell for the array.
- emitAllocateBasicJSObject<JSArray, false>(TrustedImmPtr(m_codeBlock->globalObject()->arrayStructure()), cellResult, storagePtr);
-
- // Allocate the backing store for the array.
- emitAllocateBasicStorage(initialStorage, storageResult, storagePtr);
-
- // Store all the necessary info in the ArrayStorage.
- storePtr(storageResult, Address(storageResult, ArrayStorage::allocBaseOffset()));
- store32(Imm32(length), Address(storageResult, ArrayStorage::lengthOffset()));
- store32(Imm32(length), Address(storageResult, ArrayStorage::numValuesInVectorOffset()));
-
- // Store the newly allocated ArrayStorage.
- storePtr(storageResult, Address(cellResult, JSArray::storageOffset()));
-
- // Store the vector length and index bias.
- store32(Imm32(initialLength), Address(cellResult, JSArray::vectorLengthOffset()));
- store32(TrustedImm32(0), Address(cellResult, JSArray::indexBiasOffset()));
-
- // Initialize the subclass data and the sparse value map.
- storePtr(TrustedImmPtr(0), Address(cellResult, JSArray::subclassDataOffset()));
- storePtr(TrustedImmPtr(0), Address(cellResult, JSArray::sparseValueMapOffset()));
-
- // Store the values we have.
- for (unsigned i = 0; i < length; i++) {
- loadPtr(Address(callFrameRegister, (valuesRegister + i) * sizeof(Register)), storagePtr);
- storePtr(storagePtr, Address(storageResult, ArrayStorage::vectorOffset() + sizeof(WriteBarrier<Unknown>) * i));
- }
-
- // Zero out the remaining slots.
- for (unsigned i = length; i < initialLength; i++)
- storePtr(TrustedImmPtr(0), Address(storageResult, ArrayStorage::vectorOffset() + sizeof(WriteBarrier<Unknown>) * i));
-}
-
#if ENABLE(VALUE_PROFILER)
inline void JIT::emitValueProfilingSite(ValueProfile* valueProfile)
{
Modified: trunk/Source/_javascript_Core/jit/JITOpcodes.cpp (108306 => 108307)
--- trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/jit/JITOpcodes.cpp 2012-02-21 06:34:14 UTC (rev 108307)
@@ -29,7 +29,6 @@
#include "JIT.h"
#include "Arguments.h"
-#include "CopiedSpaceInlineMethods.h"
#include "Heap.h"
#include "JITInlineMethods.h"
#include "JITStubCall.h"
@@ -1646,29 +1645,6 @@
void JIT::emit_op_new_array(Instruction* currentInstruction)
{
- int length = currentInstruction[3].u.operand;
- // FIXME: Add support for non-empty arrays. This involves copying the values over.
- if (CopiedSpace::isOversize(JSArray::storageSize(length))) {
- JITStubCall stubCall(this, cti_op_new_array);
- stubCall.addArgument(Imm32(currentInstruction[2].u.operand));
- stubCall.addArgument(Imm32(currentInstruction[3].u.operand));
- stubCall.call(currentInstruction[1].u.operand);
- return;
- }
- int dst = currentInstruction[1].u.operand;
- int values = currentInstruction[2].u.operand;
-
- emitAllocateJSArray(values, length, regT0, regT1, regT2);
- emitStoreCell(dst, regT0);
-}
-
-void JIT::emitSlow_op_new_array(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
-{
- int length = currentInstruction[3].u.operand;
- if (CopiedSpace::isOversize(JSArray::storageSize(length)))
- return;
- linkSlowCase(iter); // Not enough space in MarkedSpace for cell.
- linkSlowCase(iter); // Not enough space in CopiedSpace for storage.
JITStubCall stubCall(this, cti_op_new_array);
stubCall.addArgument(Imm32(currentInstruction[2].u.operand));
stubCall.addArgument(Imm32(currentInstruction[3].u.operand));
Modified: trunk/Source/_javascript_Core/runtime/JSArray.cpp (108306 => 108307)
--- trunk/Source/_javascript_Core/runtime/JSArray.cpp 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/runtime/JSArray.cpp 2012-02-21 06:34:14 UTC (rev 108307)
@@ -104,6 +104,20 @@
// This value is capped by the constant FIRST_VECTOR_GROW defined above.
static unsigned lastArraySize = 0;
+static inline size_t storageSize(unsigned vectorLength)
+{
+ ASSERT(vectorLength <= MAX_STORAGE_VECTOR_LENGTH);
+
+ // MAX_STORAGE_VECTOR_LENGTH is defined such that provided (vectorLength <= MAX_STORAGE_VECTOR_LENGTH)
+ // - as asserted above - the following calculation cannot overflow.
+ size_t size = (sizeof(ArrayStorage) - sizeof(WriteBarrier<Unknown>)) + (vectorLength * sizeof(WriteBarrier<Unknown>));
+ // Assertion to detect integer overflow in previous calculation (should not be possible, provided that
+ // MAX_STORAGE_VECTOR_LENGTH is correctly defined).
+ ASSERT(((size - (sizeof(ArrayStorage) - sizeof(WriteBarrier<Unknown>))) / sizeof(WriteBarrier<Unknown>) == vectorLength) && (size >= (sizeof(ArrayStorage) - sizeof(WriteBarrier<Unknown>))));
+
+ return size;
+}
+
static inline bool isDenseEnoughForVector(unsigned length, unsigned numValues)
{
return length <= MIN_SPARSE_ARRAY_INDEX || length / minDensityMultiplier <= numValues;
Modified: trunk/Source/_javascript_Core/runtime/JSArray.h (108306 => 108307)
--- trunk/Source/_javascript_Core/runtime/JSArray.h 2012-02-21 06:30:07 UTC (rev 108306)
+++ trunk/Source/_javascript_Core/runtime/JSArray.h 2012-02-21 06:34:14 UTC (rev 108307)
@@ -119,16 +119,10 @@
bool m_inCompactInitialization;
#endif
WriteBarrier<Unknown> m_vector[1];
-
- static ptrdiff_t lengthOffset() { return OBJECT_OFFSETOF(ArrayStorage, m_length); }
- static ptrdiff_t numValuesInVectorOffset() { return OBJECT_OFFSETOF(ArrayStorage, m_numValuesInVector); }
- static ptrdiff_t allocBaseOffset() { return OBJECT_OFFSETOF(ArrayStorage, m_allocBase); }
- static ptrdiff_t vectorOffset() { return OBJECT_OFFSETOF(ArrayStorage, m_vector); }
};
class JSArray : public JSNonFinalObject {
friend class Walker;
- friend class JIT;
protected:
JS_EXPORT_PRIVATE explicit JSArray(JSGlobalData&, Structure*);
@@ -264,7 +258,6 @@
JS_EXPORT_PRIVATE void setSubclassData(void*);
private:
- static size_t storageSize(unsigned vectorLength);
bool isLengthWritable()
{
SparseArrayValueMap* map = m_sparseValueMap;
@@ -296,10 +289,6 @@
// FIXME: Maybe SparseArrayValueMap should be put into its own JSCell?
SparseArrayValueMap* m_sparseValueMap;
void* m_subclassData; // A JSArray subclass can use this to fill the vector lazily.
-
- static ptrdiff_t sparseValueMapOffset() { return OBJECT_OFFSETOF(JSArray, m_sparseValueMap); }
- static ptrdiff_t subclassDataOffset() { return OBJECT_OFFSETOF(JSArray, m_subclassData); }
- static ptrdiff_t indexBiasOffset() { return OBJECT_OFFSETOF(JSArray, m_indexBias); }
};
inline JSArray* JSArray::create(JSGlobalData& globalData, Structure* structure, unsigned initialLength)
@@ -341,30 +330,6 @@
return i;
}
-// The definition of MAX_STORAGE_VECTOR_LENGTH is dependant on the definition storageSize
-// function below - the MAX_STORAGE_VECTOR_LENGTH limit is defined such that the storage
-// size calculation cannot overflow. (sizeof(ArrayStorage) - sizeof(WriteBarrier<Unknown>)) +
-// (vectorLength * sizeof(WriteBarrier<Unknown>)) must be <= 0xFFFFFFFFU (which is maximum value of size_t).
-#define MAX_STORAGE_VECTOR_LENGTH static_cast<unsigned>((0xFFFFFFFFU - (sizeof(ArrayStorage) - sizeof(WriteBarrier<Unknown>))) / sizeof(WriteBarrier<Unknown>))
+} // namespace JSC
-// These values have to be macros to be used in max() and min() without introducing
-// a PIC branch in Mach-O binaries, see <rdar://problem/5971391>.
-#define MIN_SPARSE_ARRAY_INDEX 10000U
-#define MAX_STORAGE_VECTOR_INDEX (MAX_STORAGE_VECTOR_LENGTH - 1)
- inline size_t JSArray::storageSize(unsigned vectorLength)
- {
- ASSERT(vectorLength <= MAX_STORAGE_VECTOR_LENGTH);
-
- // MAX_STORAGE_VECTOR_LENGTH is defined such that provided (vectorLength <= MAX_STORAGE_VECTOR_LENGTH)
- // - as asserted above - the following calculation cannot overflow.
- size_t size = (sizeof(ArrayStorage) - sizeof(WriteBarrier<Unknown>)) + (vectorLength * sizeof(WriteBarrier<Unknown>));
- // Assertion to detect integer overflow in previous calculation (should not be possible, provided that
- // MAX_STORAGE_VECTOR_LENGTH is correctly defined).
- ASSERT(((size - (sizeof(ArrayStorage) - sizeof(WriteBarrier<Unknown>))) / sizeof(WriteBarrier<Unknown>) == vectorLength) && (size >= (sizeof(ArrayStorage) - sizeof(WriteBarrier<Unknown>))));
-
- return size;
- }
-
- } // namespace JSC
-
#endif // JSArray_h
