Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164547 => 164548)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-22 19:55:12 UTC (rev 164548)
@@ -1,3 +1,28 @@
+2014-02-21 Filip Pizlo <[email protected]>
+
+ It should be possible for a LinkBuffer to outlive the MacroAssembler and still be useful
+ https://bugs.webkit.org/show_bug.cgi?id=124733
+
+ Reviewed by Oliver Hunt.
+
+ This also takes the opportunity to de-duplicate some branch compaction code.
+
+ * assembler/ARM64Assembler.h:
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMv7Assembler::buffer):
+ * assembler/AssemblerBuffer.h:
+ (JSC::AssemblerData::AssemblerData):
+ (JSC::AssemblerBuffer::AssemblerBuffer):
+ (JSC::AssemblerBuffer::storage):
+ (JSC::AssemblerBuffer::grow):
+ * assembler/LinkBuffer.h:
+ (JSC::LinkBuffer::LinkBuffer):
+ (JSC::LinkBuffer::executableOffsetFor):
+ (JSC::LinkBuffer::applyOffset):
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::link):
+ * assembler/MacroAssemblerARMv7.h:
+
2014-02-21 Brent Fulgham <[email protected]>
Extend media support for WebVTT sources
Modified: trunk/Source/_javascript_Core/assembler/ARM64Assembler.h (164547 => 164548)
--- trunk/Source/_javascript_Core/assembler/ARM64Assembler.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/_javascript_Core/assembler/ARM64Assembler.h 2014-02-22 19:55:12 UTC (rev 164548)
@@ -2590,13 +2590,6 @@
return b.m_offset - a.m_offset;
}
- int executableOffsetFor(int location)
- {
- if (!location)
- return 0;
- return static_cast<int32_t*>(m_buffer.data())[location / sizeof(int32_t) - 1];
- }
-
void* unlinkedCode() { return m_buffer.data(); }
size_t codeSize() const { return m_buffer.codeSize(); }
Modified: trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h (164547 => 164548)
--- trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h 2014-02-22 19:55:12 UTC (rev 164548)
@@ -583,6 +583,8 @@
{
}
+ AssemblerBuffer& buffer() { return m_formatter.m_buffer; }
+
private:
// ARMv7, Appx-A.6.3
@@ -2059,13 +2061,6 @@
return b.m_offset - a.m_offset;
}
- int executableOffsetFor(int location)
- {
- if (!location)
- return 0;
- return static_cast<int32_t*>(m_formatter.data())[location / sizeof(int32_t) - 1];
- }
-
int jumpSizeDelta(JumpType jumpType, JumpLinkType jumpLinkType) { return JUMP_ENUM_SIZE(jumpType) - JUMP_ENUM_SIZE(jumpLinkType); }
// Assembler admin methods:
Modified: trunk/Source/_javascript_Core/assembler/AssemblerBuffer.h (164547 => 164548)
--- trunk/Source/_javascript_Core/assembler/AssemblerBuffer.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/_javascript_Core/assembler/AssemblerBuffer.h 2014-02-22 19:55:12 UTC (rev 164548)
@@ -59,13 +59,21 @@
uint32_t m_offset;
};
+ struct AssemblerData : public RefCounted<AssemblerData> {
+ static const int inlineCapacity = 128;
+
+ AssemblerData() : m_data(inlineCapacity) { }
+
+ typedef Vector<char, inlineCapacity, UnsafeVectorOverflow> DataVector;
+ DataVector m_data;
+ };
+
class AssemblerBuffer {
- static const int inlineCapacity = 128;
public:
AssemblerBuffer()
- : m_storage(inlineCapacity)
- , m_buffer(m_storage.begin())
- , m_capacity(inlineCapacity)
+ : m_storage(adoptRef(new AssemblerData()))
+ , m_buffer(m_storage->m_data.begin())
+ , m_capacity(AssemblerData::inlineCapacity)
, m_index(0)
{
}
@@ -130,6 +138,8 @@
}
unsigned debugOffset() { return m_index; }
+
+ AssemblerData* storage() { return m_storage.get(); }
protected:
void append(const char* data, int size)
@@ -145,12 +155,12 @@
{
m_capacity += m_capacity / 2 + extraCapacity;
- m_storage.grow(m_capacity);
- m_buffer = m_storage.begin();
+ m_storage->m_data.grow(m_capacity);
+ m_buffer = m_storage->m_data.begin();
}
private:
- Vector<char, inlineCapacity, UnsafeVectorOverflow> m_storage;
+ RefPtr<AssemblerData> m_storage;
char* m_buffer;
int m_capacity;
int m_index;
Modified: trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp (164547 => 164548)
--- trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp 2014-02-22 19:55:12 UTC (rev 164548)
@@ -112,7 +112,7 @@
if (jumpsToLink[i].to() >= jumpsToLink[i].from())
target = outData + jumpsToLink[i].to() - offset; // Compensate for what we have collapsed so far
else
- target = outData + jumpsToLink[i].to() - m_assembler->executableOffsetFor(jumpsToLink[i].to());
+ target = outData + jumpsToLink[i].to() - executableOffsetFor(jumpsToLink[i].to());
JumpLinkType jumpLinkType = m_assembler->computeJumpType(jumpsToLink[i], outData + writePtr, target);
// Compact branch if we can...
@@ -132,7 +132,7 @@
for (unsigned i = 0; i < jumpCount; ++i) {
uint8_t* location = outData + jumpsToLink[i].from();
- uint8_t* target = outData + jumpsToLink[i].to() - m_assembler->executableOffsetFor(jumpsToLink[i].to());
+ uint8_t* target = outData + jumpsToLink[i].to() - executableOffsetFor(jumpsToLink[i].to());
m_assembler->link(jumpsToLink[i], location, target);
}
Modified: trunk/Source/_javascript_Core/assembler/LinkBuffer.h (164547 => 164548)
--- trunk/Source/_javascript_Core/assembler/LinkBuffer.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/_javascript_Core/assembler/LinkBuffer.h 2014-02-22 19:55:12 UTC (rev 164548)
@@ -87,6 +87,7 @@
#endif
, m_didAllocate(false)
, m_code(0)
+ , m_storage(masm->m_assembler.buffer().storage())
, m_assembler(masm)
, m_vm(&vm)
#ifndef NDEBUG
@@ -103,6 +104,7 @@
#endif
, m_didAllocate(false)
, m_code(code)
+ , m_storage(masm->m_assembler.buffer().storage())
, m_assembler(masm)
, m_vm(&vm)
#ifndef NDEBUG
@@ -257,10 +259,19 @@
}
private:
+#if ENABLE(BRANCH_COMPACTION)
+ int executableOffsetFor(int location)
+ {
+ if (!location)
+ return 0;
+ return bitwise_cast<int32_t*>(m_storage->m_data.begin())[location / sizeof(int32_t) - 1];
+ }
+#endif
+
template <typename T> T applyOffset(T src)
{
#if ENABLE(BRANCH_COMPACTION)
- src.m_offset -= m_assembler->executableOffsetFor(src.m_offset);
+ src.m_offset -= executableOffsetFor(src.m_offset);
#endif
return src;
}
@@ -297,6 +308,7 @@
#endif
bool m_didAllocate;
void* m_code;
+ RefPtr<AssemblerData> m_storage;
MacroAssembler* m_assembler;
VM* m_vm;
#ifndef NDEBUG
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (164547 => 164548)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2014-02-22 19:55:12 UTC (rev 164548)
@@ -70,7 +70,6 @@
void recordLinkOffsets(int32_t regionStart, int32_t regionEnd, int32_t offset) {return m_assembler.recordLinkOffsets(regionStart, regionEnd, offset); }
int jumpSizeDelta(JumpType jumpType, JumpLinkType jumpLinkType) { return m_assembler.jumpSizeDelta(jumpType, jumpLinkType); }
void link(LinkRecord& record, uint8_t* from, uint8_t* to) { return m_assembler.link(record, from, to); }
- int executableOffsetFor(int location) { return m_assembler.executableOffsetFor(location); }
static const Scale ScalePtr = TimesEight;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (164547 => 164548)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-02-22 18:44:28 UTC (rev 164547)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-02-22 19:55:12 UTC (rev 164548)
@@ -1790,11 +1790,6 @@
}
- int executableOffsetFor(int location)
- {
- return m_assembler.executableOffsetFor(location);
- }
-
static FunctionPtr readCallTarget(CodeLocationCall call)
{
return FunctionPtr(reinterpret_cast<void(*)()>(ARMv7Assembler::readCallTarget(call.dataLocation())));
