Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 104 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/jit/PCToCodeOriginMap.h b/Source/JavaScriptCore/jit/PCToCodeOriginMap.h
new file mode 100644
index 000000000..75b54448c
--- /dev/null
+++ b/Source/JavaScriptCore/jit/PCToCodeOriginMap.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2016 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 PCToCodeOriginMap_h
+#define PCToCodeOriginMap_h
+
+#if ENABLE(JIT)
+
+#include "CodeOrigin.h"
+#include "DFGCommon.h"
+#include "MacroAssembler.h"
+#include "VM.h"
+#include <wtf/Bag.h>
+#include <wtf/Optional.h>
+#include <wtf/RedBlackTree.h>
+#include <wtf/Vector.h>
+
+namespace JSC {
+
+#if ENABLE(FTL_JIT)
+namespace B3 {
+class PCToOriginMap;
+}
+#endif
+
+class LinkBuffer;
+class PCToCodeOriginMapBuilder;
+
+class PCToCodeOriginMapBuilder {
+    WTF_MAKE_NONCOPYABLE(PCToCodeOriginMapBuilder);
+    friend class PCToCodeOriginMap;
+
+public:
+    PCToCodeOriginMapBuilder(VM&);
+    PCToCodeOriginMapBuilder(PCToCodeOriginMapBuilder&& other);
+
+#if ENABLE(FTL_JIT)
+    PCToCodeOriginMapBuilder(VM&, B3::PCToOriginMap&&);
+#endif
+
+    void appendItem(MacroAssembler::Label, const CodeOrigin&);
+    static CodeOrigin defaultCodeOrigin() { return CodeOrigin(0, nullptr); }
+
+    bool didBuildMapping() const { return m_shouldBuildMapping; }
+
+private:
+
+    struct CodeRange {
+        MacroAssembler::Label start;
+        MacroAssembler::Label end;
+        CodeOrigin codeOrigin;
+    };
+
+    VM& m_vm;
+    Vector<CodeRange> m_codeRanges;
+    bool m_shouldBuildMapping;
+};
+
+class PCToCodeOriginMap {
+    WTF_MAKE_NONCOPYABLE(PCToCodeOriginMap);
+public:
+    PCToCodeOriginMap(PCToCodeOriginMapBuilder&&, LinkBuffer&);
+    ~PCToCodeOriginMap();
+
+    Optional<CodeOrigin> findPC(void* pc) const;
+
+    double memorySize();
+
+private:
+    size_t m_compressedPCBufferSize;
+    size_t m_compressedCodeOriginsSize;
+    uint8_t* m_compressedPCs;
+    uint8_t* m_compressedCodeOrigins;
+    uintptr_t m_pcRangeStart;
+    uintptr_t m_pcRangeEnd;
+};
+
+} // namespace JSC
+
+#endif // ENABLE(JIT)
+
+#endif // PCToCodeOriginMap_h