Title: [157500] trunk/Source/_javascript_Core
- Revision
- 157500
- Author
- commit-qu...@webkit.org
- Date
- 2013-10-16 01:40:51 -0700 (Wed, 16 Oct 2013)
Log Message
Remove more of the UNINTERRUPTED_SEQUENCE thing
https://bugs.webkit.org/show_bug.cgi?id=122885
Patch by Julien Brianceau <jbria...@cisco.com> on 2013-10-16
Reviewed by Andreas Kling.
It was not completely removed by r157481, leading to build failure for sh4 architecture.
* jit/JIT.h:
* jit/JITInlines.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (157499 => 157500)
--- trunk/Source/_javascript_Core/ChangeLog 2013-10-16 08:35:21 UTC (rev 157499)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-10-16 08:40:51 UTC (rev 157500)
@@ -1,3 +1,15 @@
+2013-10-16 Julien Brianceau <jbria...@cisco.com>
+
+ Remove more of the UNINTERRUPTED_SEQUENCE thing
+ https://bugs.webkit.org/show_bug.cgi?id=122885
+
+ Reviewed by Andreas Kling.
+
+ It was not completely removed by r157481, leading to build failure for sh4 architecture.
+
+ * jit/JIT.h:
+ * jit/JITInlines.h:
+
2013-10-15 Filip Pizlo <fpi...@apple.com>
Get rid of the StructureStubInfo::patch union
Modified: trunk/Source/_javascript_Core/jit/JIT.h (157499 => 157500)
--- trunk/Source/_javascript_Core/jit/JIT.h 2013-10-16 08:35:21 UTC (rev 157499)
+++ trunk/Source/_javascript_Core/jit/JIT.h 2013-10-16 08:40:51 UTC (rev 157500)
@@ -907,12 +907,6 @@
#endif
unsigned m_jumpTargetsPosition;
-#ifndef NDEBUG
-#if defined(ASSEMBLER_HAS_CONSTANT_POOL) && ASSEMBLER_HAS_CONSTANT_POOL
- Label m_uninterruptedInstructionSequenceBegin;
- int m_uninterruptedConstantSequenceBegin;
-#endif
-#endif
OwnPtr<JITDisassembler> m_disassembler;
RefPtr<Profiler::Compilation> m_compilation;
WeakRandom m_randomGenerator;
Modified: trunk/Source/_javascript_Core/jit/JITInlines.h (157499 => 157500)
--- trunk/Source/_javascript_Core/jit/JITInlines.h 2013-10-16 08:35:21 UTC (rev 157499)
+++ trunk/Source/_javascript_Core/jit/JITInlines.h 2013-10-16 08:40:51 UTC (rev 157500)
@@ -116,68 +116,6 @@
return false;
}
-#if defined(ASSEMBLER_HAS_CONSTANT_POOL) && ASSEMBLER_HAS_CONSTANT_POOL
-
-ALWAYS_INLINE void JIT::beginUninterruptedSequence(int insnSpace, int constSpace)
-{
-#if CPU(ARM_TRADITIONAL)
-#ifndef NDEBUG
- // Ensure the label after the sequence can also fit
- insnSpace += sizeof(ARMWord);
- constSpace += sizeof(uint64_t);
-#endif
-
- ensureSpace(insnSpace, constSpace);
-
-#elif CPU(SH4)
-#ifndef NDEBUG
- insnSpace += sizeof(SH4Word);
- constSpace += sizeof(uint64_t);
-#endif
-
- m_assembler.ensureSpace(insnSpace + m_assembler.maxInstructionSize + 2, constSpace + 8);
-#endif
-
-#ifndef NDEBUG
- m_uninterruptedInstructionSequenceBegin = label();
- m_uninterruptedConstantSequenceBegin = sizeOfConstantPool();
-#endif
-}
-
-ALWAYS_INLINE void JIT::endUninterruptedSequence(int insnSpace, int constSpace, int dst)
-{
-#ifndef NDEBUG
- /* There are several cases when the uninterrupted sequence is larger than
- * maximum required offset for pathing the same sequence. Eg.: if in a
- * uninterrupted sequence the last macroassembler's instruction is a stub
- * call, it emits store instruction(s) which should not be included in the
- * calculation of length of uninterrupted sequence. So, the insnSpace and
- * constSpace should be upper limit instead of hard limit.
- */
-
-#if CPU(SH4)
- if ((dst > 15) || (dst < -16)) {
- insnSpace += 8;
- constSpace += 2;
- }
-
- if (((dst >= -16) && (dst < 0)) || ((dst > 7) && (dst <= 15)))
- insnSpace += 8;
-#else
- UNUSED_PARAM(dst);
-#endif
-
- ASSERT(differenceBetween(m_uninterruptedInstructionSequenceBegin, label()) <= insnSpace);
- ASSERT(sizeOfConstantPool() - m_uninterruptedConstantSequenceBegin <= constSpace);
-#else
- UNUSED_PARAM(insnSpace);
- UNUSED_PARAM(constSpace);
- UNUSED_PARAM(dst);
-#endif
-}
-
-#endif // ASSEMBLER_HAS_CONSTANT_POOL
-
ALWAYS_INLINE void JIT::updateTopCallFrame()
{
ASSERT(static_cast<int>(m_bytecodeOffset) >= 0);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
