diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 10:13:40 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 10:13:40 +0300 |
| commit | 540c4e4a5def8c350a49bb68380b787ae62490c6 (patch) | |
| tree | 722a54334842c8635fe7f94eab544be31ef76017 /src/3rdparty/masm/assembler/ARM64Assembler.h | |
| parent | 19ed7973a311a8d42d3a558bb551230e902ce9b9 (diff) | |
| parent | 79af79e9fdbd2a4d52a4e8994eb58cfddfeb8e9b (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl
Change-Id: I49d3f2094eee9709c4cd68433047dfad0c3414fa
Diffstat (limited to 'src/3rdparty/masm/assembler/ARM64Assembler.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/ARM64Assembler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/ARM64Assembler.h b/src/3rdparty/masm/assembler/ARM64Assembler.h index ca6b33d39a..3e988a277c 100644 --- a/src/3rdparty/masm/assembler/ARM64Assembler.h +++ b/src/3rdparty/masm/assembler/ARM64Assembler.h @@ -676,11 +676,11 @@ public: struct RealTypes { int64_t m_from : 48; int64_t m_to : 48; + RegisterID m_compareRegister; JumpType m_type : 8; JumpLinkType m_linkType : 8; Condition m_condition : 4; unsigned m_bitNumber : 6; - RegisterID m_compareRegister : 6; bool m_is64Bit : 1; } realTypes; } data; |