diff options
| author | Mai M <mathew1800@gmail.com> | 2021-11-11 17:29:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 17:29:37 -0500 |
| commit | c55721c754cebdecd68ef6873c1f1837776322fc (patch) | |
| tree | 0c334442e3f6b561be56283bbb76d821cfd0e87b /Source/Core | |
| parent | aa6db1e029f513b3eb4b1d418a61dbc8eca20a41 (diff) | |
| parent | 58dc9e70499bb51dc355ada9dbd658b037fd1aa6 (diff) | |
Merge pull request #10210 from shuffle2/vs2022
msvc: update to vs2022 and windows sdk 10.0.22000
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/SCMRevGen.vcxproj | 2 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/Common/SCMRevGen.vcxproj b/Source/Core/Common/SCMRevGen.vcxproj index 938df1c6f7..52d8cb7ef4 100644 --- a/Source/Core/Common/SCMRevGen.vcxproj +++ b/Source/Core/Common/SCMRevGen.vcxproj @@ -26,7 +26,7 @@ <PropertyGroup Label="Configuration"> <ConfigurationType>Utility</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> + <PlatformToolset>v143</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp index 63aa016322..b311261997 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp @@ -926,7 +926,8 @@ void JitArm64::mtfsfx(UGeckoInstruction inst) if (LogicalImm imm = LogicalImm(mask, 32)) { - AND(WA, WA, LogicalImm(~mask, 32)); + const u32 inverted_mask = ~mask; + AND(WA, WA, LogicalImm(inverted_mask, 32)); AND(WB, WB, imm); } else |