ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmEmitter: make it more readable

This commit is contained in:
Tillmann Karras 2014-02-27 18:28:00 +01:00
parent 46e7c0657f
commit 7a66a3ded1
2 changed files with 51 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
Source/Core/Common/ArmEmitter.cpp
View File

@ -335,7 +335,7 @@ void ARMXEmitter::NOP(int count)
void ARMXEmitter::SETEND(bool BE) void ARMXEmitter::SETEND(bool BE)
{ {
//SETEND is non-conditional //SETEND is non-conditional
Write32( 0xF1010000 | (BE << 9)); Write32(0xF1010000 | (BE << 9));
} }
void ARMXEmitter::BKPT(u16 arg) void ARMXEmitter::BKPT(u16 arg)
{ {
@ -380,9 +380,8 @@ FixupBranch ARMXEmitter::B_CC(CCFlags Cond)
void ARMXEmitter::B_CC(CCFlags Cond, const void *fnptr) void ARMXEmitter::B_CC(CCFlags Cond, const void *fnptr)
{ {
s32 distance = (s32)fnptr - (s32(code) + 8); s32 distance = (s32)fnptr - (s32(code) + 8);
_dbg_assert_msg_(DYNA_REC, distance > -33554432 _dbg_assert_msg_(DYNA_REC, distance > -0x2000000 && distance <= 0x2000000,
&& distance <= 33554432, "B_CC out of range (%p calls %p)", code, fnptr);
"B_CC out of range (%p calls %p)", code, fnptr);
Write32((Cond << 28) | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF)); Write32((Cond << 28) | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF));
} }
@ -399,23 +398,17 @@ FixupBranch ARMXEmitter::BL_CC(CCFlags Cond)
void ARMXEmitter::SetJumpTarget(FixupBranch const &branch) void ARMXEmitter::SetJumpTarget(FixupBranch const &branch)
{ {
s32 distance = (s32(code) - 8) - (s32)branch.ptr; s32 distance = (s32(code) - 8) - (s32)branch.ptr;
_dbg_assert_msg_(DYNA_REC, distance > -33554432 _dbg_assert_msg_(DYNA_REC, distance > -0x2000000 && distance <= 0x2000000,
&& distance <= 33554432, "SetJumpTarget out of range (%p calls %p)", code, branch.ptr);
"SetJumpTarget out of range (%p calls %p)", code, u32 instr = (u32)(branch.condition | ((distance >> 2) & 0x00FFFFFF));
branch.ptr); instr |= branch.type ? /* B */ 0x0A000000 : /* BL */ 0x0B000000;
if(branch.type == 0) // B *(u32*)branch.ptr = instr;
*(u32*)branch.ptr = (u32)(branch.condition | (10 << 24) | ((distance >> 2) &
0x00FFFFFF));
else // BL
*(u32*)branch.ptr = (u32)(branch.condition | 0x0B000000 | ((distance >> 2)
& 0x00FFFFFF));
} }
void ARMXEmitter::B (const void *fnptr) void ARMXEmitter::B(const void *fnptr)
{ {
s32 distance = (s32)fnptr - (s32(code) + 8); s32 distance = (s32)fnptr - (s32(code) + 8);
_dbg_assert_msg_(DYNA_REC, distance > -33554432 _dbg_assert_msg_(DYNA_REC, distance > -0x2000000 && distance <= 0x2000000,
&& distance <= 33554432, "B out of range (%p calls %p)", code, fnptr);
"B out of range (%p calls %p)", code, fnptr);
Write32(condition | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF)); Write32(condition | 0x0A000000 | ((distance >> 2) & 0x00FFFFFF));
} }
@ -427,7 +420,7 @@ void ARMXEmitter::B(ARMReg src)
bool ARMXEmitter::BLInRange(const void *fnptr) { bool ARMXEmitter::BLInRange(const void *fnptr) {
s32 distance = (s32)fnptr - (s32(code) + 8); s32 distance = (s32)fnptr - (s32(code) + 8);
if (distance <= -33554432 || distance > 33554432) if (distance <= -0x2000000 || distance > 0x2000000)
return false; return false;
else else
return true; return true;
@ -436,9 +429,8 @@ bool ARMXEmitter::BLInRange(const void *fnptr) {
void ARMXEmitter::BL(const void *fnptr) void ARMXEmitter::BL(const void *fnptr)
{ {
s32 distance = (s32)fnptr - (s32(code) + 8); s32 distance = (s32)fnptr - (s32(code) + 8);
_dbg_assert_msg_(DYNA_REC, distance > -33554432 _dbg_assert_msg_(DYNA_REC, distance > -0x2000000 && distance <= 0x2000000,
&& distance <= 33554432, "BL out of range (%p calls %p)", code, fnptr);
"BL out of range (%p calls %p)", code, fnptr);
Write32(condition | 0x0B000000 | ((distance >> 2) & 0x00FFFFFF)); Write32(condition | 0x0B000000 | ((distance >> 2) & 0x00FFFFFF));
} }
void ARMXEmitter::BL(ARMReg src) void ARMXEmitter::BL(ARMReg src)
@ -487,42 +479,42 @@ void ARMXEmitter::WriteShiftedDataOp(u32 op, bool SetFlags, ARMReg dest, ARMReg
// IMM, REG, IMMSREG, RSR // IMM, REG, IMMSREG, RSR
// -1 for invalid if the instruction doesn't support that // -1 for invalid if the instruction doesn't support that
const s32 InstOps[][4] = {{16, 0, 0, 0}, // AND(s) const s32 InstOps[][4] = {{16, 0, 0, 0}, // AND(s)
{17, 1, 1, 1}, // EOR(s) {17, 1, 1, 1}, // EOR(s)
{18, 2, 2, 2}, // SUB(s) {18, 2, 2, 2}, // SUB(s)
{19, 3, 3, 3}, // RSB(s) {19, 3, 3, 3}, // RSB(s)
{20, 4, 4, 4}, // ADD(s) {20, 4, 4, 4}, // ADD(s)
{21, 5, 5, 5}, // ADC(s) {21, 5, 5, 5}, // ADC(s)
{22, 6, 6, 6}, // SBC(s) {22, 6, 6, 6}, // SBC(s)
{23, 7, 7, 7}, // RSC(s) {23, 7, 7, 7}, // RSC(s)
{24, 8, 8, 8}, // TST {24, 8, 8, 8}, // TST
{25, 9, 9, 9}, // TEQ {25, 9, 9, 9}, // TEQ
{26, 10, 10, 10}, // CMP {26, 10, 10, 10}, // CMP
{27, 11, 11, 11}, // CMN {27, 11, 11, 11}, // CMN
{28, 12, 12, 12}, // ORR(s) {28, 12, 12, 12}, // ORR(s)
{29, 13, 13, 13}, // MOV(s) {29, 13, 13, 13}, // MOV(s)
{30, 14, 14, 14}, // BIC(s) {30, 14, 14, 14}, // BIC(s)
{31, 15, 15, 15}, // MVN(s) {31, 15, 15, 15}, // MVN(s)
{24, -1, -1, -1}, // MOVW {24, -1, -1, -1}, // MOVW
{26, -1, -1, -1}, // MOVT {26, -1, -1, -1}, // MOVT
}; };
const char *InstNames[] = { "AND", const char *InstNames[] = {"AND",
"EOR", "EOR",
"SUB", "SUB",
"RSB", "RSB",
"ADD", "ADD",
"ADC", "ADC",
"SBC", "SBC",
"RSC", "RSC",
"TST", "TST",
"TEQ", "TEQ",
"CMP", "CMP",
"CMN", "CMN",
"ORR", "ORR",
"MOV", "MOV",
"BIC", "BIC",
"MVN" "MVN"
}; };
void ARMXEmitter::AND (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(0, Rd, Rn, Rm); } void ARMXEmitter::AND (ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(0, Rd, Rn, Rm); }
void ARMXEmitter::ANDS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(0, Rd, Rn, Rm, true); } void ARMXEmitter::ANDS(ARMReg Rd, ARMReg Rn, Operand2 Rm) { WriteInstruction(0, Rd, Rn, Rm, true); }

4
Source/Core/DolphinWX/WxUtils.cpp
View File

@ -54,9 +54,9 @@ double GetCurrentBitmapLogicalScale()
{ {
#ifdef __APPLE__ #ifdef __APPLE__
// wx doesn't expose this itself, unfortunately. // wx doesn't expose this itself, unfortunately.
if ([[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)]) if ([[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)])
{ {
return [[NSScreen mainScreen] backingScaleFactor]; return [[NSScreen mainScreen] backingScaleFactor];
} }
#endif #endif
return 1.0; return 1.0;