SwitchEmu/dynarmic
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/dynarmic.git synced 2026-02-18 22:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc. fixups of MSVC build

Browse Source
This commit is contained in:
MerryMage
2018-01-12 17:31:21 +00:00
parent a1dfa01515
commit aa74a8130b
7 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/A64/translate/impl/branch.cpp
View File

@@ -94,7 +94,7 @@ bool TranslatorVisitor::CBNZ(bool sf, Imm<19> imm19, Reg Rt) {
bool TranslatorVisitor::TBZ(Imm<1> b5, Imm<5> b40, Imm<14> imm14, Reg Rt) {
size_t datasize = b5 == 1 ? 64 : 32;
size_t bit_pos = concatenate(b5, b40).ZeroExtend<size_t>();
u8 bit_pos = concatenate(b5, b40).ZeroExtend<u8>();
s64 offset = concatenate(imm14, Imm<2>{0}).SignExtend<s64>();
auto operand = X(datasize, Rt);
@@ -110,7 +110,7 @@ bool TranslatorVisitor::TBZ(Imm<1> b5, Imm<5> b40, Imm<14> imm14, Reg Rt) {
bool TranslatorVisitor::TBNZ(Imm<1> b5, Imm<5> b40, Imm<14> imm14, Reg Rt) {
size_t datasize = b5 == 1 ? 64 : 32;
size_t bit_pos = concatenate(b5, b40).ZeroExtend<size_t>();
u8 bit_pos = concatenate(b5, b40).ZeroExtend<u8>();
s64 offset = concatenate(imm14, Imm<2>{0}).SignExtend<s64>();
auto operand = X(datasize, Rt);

2
src/frontend/A64/translate/impl/impl.cpp
View File

@@ -45,7 +45,7 @@ boost::optional<TranslatorVisitor::BitMasks> TranslatorVisitor::DecodeBitMasks(b
s32 R = s32(immr.ZeroExtend() & levels);
u64 d = u64(S - R) & levels;
size_t esize = 1 << len;
size_t esize = static_cast<size_t>(1) << len;
u64 welem = Common::Ones<u64>(S + 1);
u64 telem = Common::Ones<u64>(d + 1);
u64 wmask = Common::RotateRight(Common::Replicate(welem, esize), R);

2
src/frontend/A64/translate/impl/load_store_register_pair.cpp
View File

@@ -28,8 +28,6 @@ bool TranslatorVisitor::STP_LDP_gen(Imm<2> opc, bool not_postindex, bool wback,
return UnpredictableInstruction();
IR::U64 address;
IR::U32U64 data1;
IR::U32U64 data2;
const size_t dbytes = datasize / 8;
if (Rn == Reg::SP)