diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-08-06 14:55:21 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-08-10 14:16:09 +0000 |
| commit | 18d2f78437d28987297148b63b99ceed6313a78a (patch) | |
| tree | 845e016b002a123e394df43fcf88cf2dc7ee1fb6 /src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h | |
| parent | 577630fe4a1f6a129239788080ff9e802118fd26 (diff) | |
Update Yarr to the latest version from WebKit
Updated Yarr to a to commit
4d2a53d60487cb1f8b2a9a1e9f684af336fd7d2c in WebKit.
Adjusted the yarr code base to work with our older version of
wtf and masm.
Change-Id: I04b4593ece051e1d7aa087b87aa08c92595d1098
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h index e3c77d99e6..a7e78ad78f 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h @@ -27,6 +27,7 @@ #define MacroAssemblerCodeRef_h #include "Disassembler.h" +#include <wtf/Platform.h> #include "ExecutableAllocator.h" #include "LLIntData.h" #include <wtf/DataLog.h> @@ -141,6 +142,8 @@ public: ASSERT_VALID_CODE_POINTER(m_value); } + inline FunctionPtr(MacroAssemblerCodePtr ptr); + // MSVC doesn't seem to treat functions with different calling conventions as // different types; these methods already defined for fastcall, below. #if CALLING_CONVENTION_IS_STDCALL && !OS(WINDOWS) @@ -327,6 +330,12 @@ private: void* m_value; }; + +FunctionPtr::FunctionPtr(MacroAssemblerCodePtr ptr) + : m_value(ptr.executableAddress()) +{ +} + // MacroAssemblerCodeRef: // // A reference to a section of JIT generated code. A CodeRef consists of a |