mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

data_processing_logical: Move datasize declarations after early-exit conditionals

Browse source 
While we're at it, make variables const where applicable.
This commit is contained in:
Lioncash 2018-09-17 21:15:59 -04:00 committed by MerryMage
parent ed797e6540
commit c3a3b9687e
1 changed files with 100 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

177
src/frontend/A64/translate/impl/data_processing_logical.cpp
View file

@ -9,8 +9,10 @@
namespace Dynarmic::A64 { namespace Dynarmic::A64 {
bool TranslatorVisitor::AND_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg Rn, Reg Rd) { bool TranslatorVisitor::AND_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && N) {
if (!sf && N) return ReservedValue(); return ReservedValue();
}
u64 imm; u64 imm;
if (auto masks = DecodeBitMasks(N, imms, immr, true)) { if (auto masks = DecodeBitMasks(N, imms, immr, true)) {
imm = masks->wmask; imm = masks->wmask;
@ -18,9 +20,10 @@ bool TranslatorVisitor::AND_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg R
return ReservedValue(); return ReservedValue();
} }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
const auto operand1 = X(datasize, Rn);
auto result = ir.And(operand1, I(datasize, imm)); const auto result = ir.And(operand1, I(datasize, imm));
if (Rd == Reg::SP) { if (Rd == Reg::SP) {
SP(datasize, result); SP(datasize, result);
} else { } else {
@ -31,8 +34,10 @@ bool TranslatorVisitor::AND_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg R
} }
bool TranslatorVisitor::ORR_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg Rn, Reg Rd) { bool TranslatorVisitor::ORR_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && N) {
if (!sf && N) return ReservedValue(); return ReservedValue();
}
u64 imm; u64 imm;
if (auto masks = DecodeBitMasks(N, imms, immr, true)) { if (auto masks = DecodeBitMasks(N, imms, immr, true)) {
imm = masks->wmask; imm = masks->wmask;
@ -40,9 +45,10 @@ bool TranslatorVisitor::ORR_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg R
return ReservedValue(); return ReservedValue();
} }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
const auto operand1 = X(datasize, Rn);
auto result = ir.Or(operand1, I(datasize, imm)); const auto result = ir.Or(operand1, I(datasize, imm));
if (Rd == Reg::SP) { if (Rd == Reg::SP) {
SP(datasize, result); SP(datasize, result);
} else { } else {
@ -53,8 +59,10 @@ bool TranslatorVisitor::ORR_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg R
} }
bool TranslatorVisitor::EOR_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg Rn, Reg Rd) { bool TranslatorVisitor::EOR_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && N) {
if (!sf && N) return ReservedValue(); return ReservedValue();
}
u64 imm; u64 imm;
if (auto masks = DecodeBitMasks(N, imms, immr, true)) { if (auto masks = DecodeBitMasks(N, imms, immr, true)) {
imm = masks->wmask; imm = masks->wmask;
@ -62,9 +70,10 @@ bool TranslatorVisitor::EOR_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg R
return ReservedValue(); return ReservedValue();
} }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
const auto operand1 = X(datasize, Rn);
auto result = ir.Eor(operand1, I(datasize, imm)); const auto result = ir.Eor(operand1, I(datasize, imm));
if (Rd == Reg::SP) { if (Rd == Reg::SP) {
SP(datasize, result); SP(datasize, result);
} else { } else {
@ -75,8 +84,10 @@ bool TranslatorVisitor::EOR_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg R
} }
bool TranslatorVisitor::ANDS_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg Rn, Reg Rd) { bool TranslatorVisitor::ANDS_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && N) {
if (!sf && N) return ReservedValue(); return ReservedValue();
}
u64 imm; u64 imm;
if (auto masks = DecodeBitMasks(N, imms, immr, true)) { if (auto masks = DecodeBitMasks(N, imms, immr, true)) {
imm = masks->wmask; imm = masks->wmask;
@ -84,130 +95,142 @@ bool TranslatorVisitor::ANDS_imm(bool sf, bool N, Imm<6> immr, Imm<6> imms, Reg
return ReservedValue(); return ReservedValue();
} }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
const auto operand1 = X(datasize, Rn);
const auto result = ir.And(operand1, I(datasize, imm));
auto result = ir.And(operand1, I(datasize, imm));
ir.SetNZCV(ir.NZCVFrom(result)); ir.SetNZCV(ir.NZCVFrom(result));
X(datasize, Rd, result); X(datasize, Rd, result);
return true; return true;
} }
bool TranslatorVisitor::AND_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) { bool TranslatorVisitor::AND_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && imm6.Bit<5>()) {
if (!sf && imm6.Bit<5>()) return ReservedValue(); return ReservedValue();
u8 shift_amount = imm6.ZeroExtend<u8>(); }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)); const u8 shift_amount = imm6.ZeroExtend<u8>();
const auto operand1 = X(datasize, Rn);
const auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount));
const auto result = ir.And(operand1, operand2);
auto result = ir.And(operand1, operand2);
X(datasize, Rd, result); X(datasize, Rd, result);
return true; return true;
} }
bool TranslatorVisitor::BIC_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) { bool TranslatorVisitor::BIC_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && imm6.Bit<5>()) {
if (!sf && imm6.Bit<5>()) return ReservedValue(); return ReservedValue();
u8 shift_amount = imm6.ZeroExtend<u8>(); }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)); const u8 shift_amount = imm6.ZeroExtend<u8>();
const auto operand1 = X(datasize, Rn);
const auto operand2 = ir.Not(ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)));
const auto result = ir.And(operand1, operand2);
operand2 = ir.Not(operand2);
auto result = ir.And(operand1, operand2);
X(datasize, Rd, result); X(datasize, Rd, result);
return true; return true;
} }
bool TranslatorVisitor::ORR_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) { bool TranslatorVisitor::ORR_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && imm6.Bit<5>()) {
if (!sf && imm6.Bit<5>()) return ReservedValue(); return ReservedValue();
u8 shift_amount = imm6.ZeroExtend<u8>(); }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)); const u8 shift_amount = imm6.ZeroExtend<u8>();
const auto operand1 = X(datasize, Rn);
const auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount));
const auto result = ir.Or(operand1, operand2);
auto result = ir.Or(operand1, operand2);
X(datasize, Rd, result); X(datasize, Rd, result);
return true; return true;
} }
bool TranslatorVisitor::ORN_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) { bool TranslatorVisitor::ORN_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && imm6.Bit<5>()) {
if (!sf && imm6.Bit<5>()) return ReservedValue(); return ReservedValue();
u8 shift_amount = imm6.ZeroExtend<u8>(); }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)); const u8 shift_amount = imm6.ZeroExtend<u8>();
const auto operand1 = X(datasize, Rn);
const auto operand2 = ir.Not(ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)));
const auto result = ir.Or(operand1, operand2);
operand2 = ir.Not(operand2);
auto result = ir.Or(operand1, operand2);
X(datasize, Rd, result); X(datasize, Rd, result);
return true; return true;
} }
bool TranslatorVisitor::EOR_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) { bool TranslatorVisitor::EOR_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && imm6.Bit<5>()) {
if (!sf && imm6.Bit<5>()) return ReservedValue(); return ReservedValue();
u8 shift_amount = imm6.ZeroExtend<u8>(); }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)); const u8 shift_amount = imm6.ZeroExtend<u8>();
const auto operand1 = X(datasize, Rn);
const auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount));
const auto result = ir.Eor(operand1, operand2);
auto result = ir.Eor(operand1, operand2);
X(datasize, Rd, result); X(datasize, Rd, result);
return true; return true;
} }
bool TranslatorVisitor::EON(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) { bool TranslatorVisitor::EON(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && imm6.Bit<5>()) {
if (!sf && imm6.Bit<5>()) return ReservedValue(); return ReservedValue();
u8 shift_amount = imm6.ZeroExtend<u8>(); }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)); const u8 shift_amount = imm6.ZeroExtend<u8>();
const auto operand1 = X(datasize, Rn);
const auto operand2 = ir.Not(ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)));
const auto result = ir.Eor(operand1, operand2);
operand2 = ir.Not(operand2);
auto result = ir.Eor(operand1, operand2);
X(datasize, Rd, result); X(datasize, Rd, result);
return true; return true;
} }
bool TranslatorVisitor::ANDS_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) { bool TranslatorVisitor::ANDS_shift(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && imm6.Bit<5>()) {
if (!sf && imm6.Bit<5>()) return ReservedValue(); return ReservedValue();
u8 shift_amount = imm6.ZeroExtend<u8>(); }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)); const u8 shift_amount = imm6.ZeroExtend<u8>();
const auto operand1 = X(datasize, Rn);
const auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount));
const auto result = ir.And(operand1, operand2);
auto result = ir.And(operand1, operand2);
ir.SetNZCV(ir.NZCVFrom(result)); ir.SetNZCV(ir.NZCVFrom(result));
X(datasize, Rd, result); X(datasize, Rd, result);
return true; return true;
} }
bool TranslatorVisitor::BICS(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) { bool TranslatorVisitor::BICS(bool sf, Imm<2> shift, Reg Rm, Imm<6> imm6, Reg Rn, Reg Rd) {
size_t datasize = sf ? 64 : 32; if (!sf && imm6.Bit<5>()) {
if (!sf && imm6.Bit<5>()) return ReservedValue(); return ReservedValue();
u8 shift_amount = imm6.ZeroExtend<u8>(); }
auto operand1 = X(datasize, Rn); const size_t datasize = sf ? 64 : 32;
auto operand2 = ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)); const u8 shift_amount = imm6.ZeroExtend<u8>();
const auto operand1 = X(datasize, Rn);
const auto operand2 = ir.Not(ShiftReg(datasize, Rm, shift, ir.Imm8(shift_amount)));
const auto result = ir.And(operand1, operand2);
operand2 = ir.Not(operand2);
auto result = ir.And(operand1, operand2);
ir.SetNZCV(ir.NZCVFrom(result)); ir.SetNZCV(ir.NZCVFrom(result));
X(datasize, Rd, result); X(datasize, Rd, result);
return true; return true;
} }