Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)

Revert back to an older snapshot that should build on ARM

1 files changed, 113 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/heap/MarkStackInlineMethods.h b/Source/JavaScriptCore/heap/MarkStackInlineMethods.h
new file mode 100644
index 000000000..d3276d7fa
--- /dev/null
+++ b/Source/JavaScriptCore/heap/MarkStackInlineMethods.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2009, 2011 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef MarkStackInlineMethods_h
+#define MarkStackInlineMethods_h
+
+#include "GCThreadSharedData.h"
+#include "MarkStack.h"
+
+namespace JSC {
+
+inline size_t MarkStackArray::postIncTop()
+{
+    size_t result = m_top++;
+    ASSERT(result == m_topSegment->m_top++);
+    return result;
+}
+        
+inline size_t MarkStackArray::preDecTop()
+{
+    size_t result = --m_top;
+    ASSERT(result == --m_topSegment->m_top);
+    return result;
+}
+        
+inline void MarkStackArray::setTopForFullSegment()
+{
+    ASSERT(m_topSegment->m_top == m_segmentCapacity);
+    m_top = m_segmentCapacity;
+}
+
+inline void MarkStackArray::setTopForEmptySegment()
+{
+    ASSERT(!m_topSegment->m_top);
+    m_top = 0;
+}
+
+inline size_t MarkStackArray::top()
+{
+    ASSERT(m_top == m_topSegment->m_top);
+    return m_top;
+}
+
+#if ASSERT_DISABLED
+inline void MarkStackArray::validatePrevious() { }
+#else
+inline void MarkStackArray::validatePrevious()
+{
+    unsigned count = 0;
+    for (MarkStackSegment* current = m_topSegment->m_previous; current; current = current->m_previous)
+        count++;
+    ASSERT(count == m_numberOfPreviousSegments);
+}
+#endif
+
+inline void MarkStackArray::append(const JSCell* cell)
+{
+    if (m_top == m_segmentCapacity)
+        expand();
+    m_topSegment->data()[postIncTop()] = cell;
+}
+
+inline bool MarkStackArray::canRemoveLast()
+{
+    return !!m_top;
+}
+
+inline const JSCell* MarkStackArray::removeLast()
+{
+    return m_topSegment->data()[preDecTop()];
+}
+
+inline bool MarkStackArray::isEmpty()
+{
+    if (m_top)
+        return false;
+    if (m_topSegment->m_previous) {
+        ASSERT(m_topSegment->m_previous->m_top == m_segmentCapacity);
+        return false;
+    }
+    return true;
+}
+
+inline size_t MarkStackArray::size()
+{
+    return m_top + m_segmentCapacity * m_numberOfPreviousSegments;
+}
+
+} // namespace JSC
+
+#endif