diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:38 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-03-21 20:42:47 +0100 |
commit | 6767114285db9d0e16dc278d08f231e8561546b4 (patch) | |
tree | 0945902a2242fd7ec0a1f7fd3e6acbb769e723bd /src/3rdparty/masm/assembler/MacroAssembler.h | |
parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) | |
parent | c32b109e9dea44c6775c2dbf8f164870c1dc8971 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssembler.h')
-rw-r--r-- | src/3rdparty/masm/assembler/MacroAssembler.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssembler.h b/src/3rdparty/masm/assembler/MacroAssembler.h index 6e77a9ffb7..b442a81bd0 100644 --- a/src/3rdparty/masm/assembler/MacroAssembler.h +++ b/src/3rdparty/masm/assembler/MacroAssembler.h @@ -39,10 +39,6 @@ namespace JSC { typedef MacroAssemblerARMv7 MacroAssemblerBase; }; #elif CPU(ARM64) namespace JSC { typedef MacroAssemblerARM64 MacroAssemblerBase; }; -#elif CPU(ARM_TRADITIONAL) -#include "MacroAssemblerARM.h" -namespace JSC { typedef MacroAssemblerARM MacroAssemblerBase; }; - #elif CPU(MIPS) #include "MacroAssemblerMIPS.h" namespace JSC { @@ -57,12 +53,6 @@ namespace JSC { typedef MacroAssemblerX86 MacroAssemblerBase; }; #include "MacroAssemblerX86_64.h" namespace JSC { typedef MacroAssemblerX86_64 MacroAssemblerBase; }; -#elif CPU(SH4) -#include "MacroAssemblerSH4.h" -namespace JSC { -typedef MacroAssemblerSH4 MacroAssemblerBase; -}; - #else #error "The MacroAssembler is not supported on this platform." #endif @@ -805,12 +795,12 @@ public: Jump branchPtr(RelationalCondition cond, RegisterID left, RegisterID right) { - return branch64(cond, left, right); + return this->branch64(cond, left, right); } Jump branchPtr(RelationalCondition cond, RegisterID left, TrustedImmPtr right) { - return branch64(cond, left, TrustedImm64(right)); + return this->branch64(cond, left, TrustedImm64(right)); } Jump branchPtr(RelationalCondition cond, RegisterID left, Address right) @@ -840,7 +830,7 @@ public: Jump branchTestPtr(ResultCondition cond, RegisterID reg, TrustedImm32 mask = TrustedImm32(-1)) { - return branchTest64(cond, reg, mask); + return this->branchTest64(cond, reg, mask); } Jump branchTestPtr(ResultCondition cond, Address address, TrustedImm32 mask = TrustedImm32(-1)) @@ -1489,16 +1479,12 @@ public: typedef MacroAssembler<MacroAssemblerARMv7> DefaultMacroAssembler; #elif CPU(ARM64) typedef MacroAssembler<MacroAssemblerARM64> DefaultMacroAssembler; -#elif CPU(ARM_TRADITIONAL) -typedef MacroAssembler<MacroAssemblerARM> DefaultMacroAssembler; #elif CPU(MIPS) typedef MacroAssembler<MacroAssemblerMIPS> DefaultMacroAssembler; #elif CPU(X86) typedef MacroAssembler<MacroAssemblerX86> DefaultMacroAssembler; #elif CPU(X86_64) typedef MacroAssembler<MacroAssemblerX86_64> DefaultMacroAssembler; -#elif CPU(SH4) -typedef JSC::MacroAssemblerSH4 DefaultMacroAssembler; #endif } // namespace JSC |