diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-10 14:14:14 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-28 19:04:29 +0000 |
| commit | 39bdb9d6f30151ee24614df1dbcd2d44ec342e59 (patch) | |
| tree | 28f8966e694833576d679d65555cefbc13c25d15 /src/3rdparty/masm/assembler/MacroAssemblerARMv7.h | |
| parent | d5579e7094c70db66a193ae1daffd4c71e8fc10b (diff) | |
Changed JSC::MacroAssembler to be a template
Change-Id: If6edb7ed0fac51e93b218eb45c01274a87b9e904
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssemblerARMv7.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerARMv7.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h index 73833c0ceb..9f5a089a75 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h @@ -526,7 +526,9 @@ public: // operand objects to loads and store will be implicitly constructed if a // register is passed. -private: + // internal function, but public because of "using load32;" in template sub-classes to pull + // in the other public overloads. + void load32(ArmAddress address, RegisterID dest) { if (address.type == ArmAddress::HasIndex) @@ -541,6 +543,7 @@ private: } } +private: void load16(ArmAddress address, RegisterID dest) { if (address.type == ArmAddress::HasIndex) |