diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-06 12:19:07 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-07 14:06:05 +0000 |
| commit | cf4a7fa44403bb3bae9c98afb80222d5e03798c5 (patch) | |
| tree | f8192eea6ccffd9cb0462beb1c7829a0a48c3bb9 /src/3rdparty/masm/assembler/AbstractMacroAssembler.h | |
| parent | 791e63021e1e1333ff3c678674df8f4f18212e43 (diff) | |
Remove the bootstrap code from assembler and JIT
We don't build the assembler or the JIT in bootstrap mode.
Change-Id: Idc3a56cc1e9cfba415bef9cba221c8a60ee75010
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty/masm/assembler/AbstractMacroAssembler.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/AbstractMacroAssembler.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/3rdparty/masm/assembler/AbstractMacroAssembler.h b/src/3rdparty/masm/assembler/AbstractMacroAssembler.h index d0c1c4613e..14644a4193 100644 --- a/src/3rdparty/masm/assembler/AbstractMacroAssembler.h +++ b/src/3rdparty/masm/assembler/AbstractMacroAssembler.h @@ -66,7 +66,7 @@ public: typedef MacroAssemblerCodePtr CodePtr; typedef MacroAssemblerCodeRef CodeRef; -#if !CPU(ARM_THUMB2) && !CPU(ARM64) && !defined(V4_BOOTSTRAP) +#if !CPU(ARM_THUMB2) && !CPU(ARM64) class Jump; #endif @@ -328,7 +328,7 @@ public: friend class AbstractMacroAssembler; friend struct DFG::OSRExit; -#if CPU(ARM_THUMB2) || CPU(ARM64) || defined(V4_BOOTSTRAP) +#if CPU(ARM_THUMB2) || CPU(ARM64) using Jump = typename AssemblerType::template Jump<Label>; friend Jump; #else @@ -461,7 +461,7 @@ public: AssemblerLabel m_label; }; -#if CPU(ARM_THUMB2) || CPU(ARM64) || defined(V4_BOOTSTRAP) +#if CPU(ARM_THUMB2) || CPU(ARM64) using Jump = typename AssemblerType::template Jump<Label>; friend Jump; #endif @@ -516,7 +516,7 @@ public: // into the code buffer - it is typically used to link the jump, setting the // relative offset such that when executed it will jump to the desired // destination. -#if !CPU(ARM_THUMB2) && !CPU(ARM64) && !defined(V4_BOOTSTRAP) +#if !CPU(ARM_THUMB2) && !CPU(ARM64) class Jump { template<class TemplateAssemblerType> friend class AbstractMacroAssembler; @@ -528,7 +528,7 @@ public: { } -#if CPU(ARM_THUMB2) || defined(V4_BOOTSTRAP) +#if CPU(ARM_THUMB2) // Fixme: this information should be stored in the instruction stream, not in the Jump object. Jump(AssemblerLabel jmp, ARMv7Assembler::JumpType type = ARMv7Assembler::JumpNoCondition, ARMv7Assembler::Condition condition = ARMv7Assembler::ConditionInvalid) : m_label(jmp) @@ -621,7 +621,7 @@ public: private: AssemblerLabel m_label; -#if CPU(ARM_THUMB2) || defined(V4_BOOTSTRAP) +#if CPU(ARM_THUMB2) ARMv7Assembler::JumpType m_type; ARMv7Assembler::Condition m_condition; #endif @@ -878,12 +878,10 @@ protected: AssemblerType::repatchPointer(dataLabelPtr.dataLocation(), value); } -#if !defined(V4_BOOTSTRAP) static void* readPointer(CodeLocationDataLabelPtr dataLabelPtr) { return AssemblerType::readPointer(dataLabelPtr.dataLocation()); } -#endif static void replaceWithLoad(CodeLocationConvertibleLoad label) { |