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

Moved ToMask hashing into utility func, changed J_CC end to a short jump 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5377 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
j4ck.fr0st 2010-04-16 13:32:13 +00:00
parent ebac492716
commit 060eed80c1
2 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DSPCore/Src/DSPEmitter.h
View File

@ -35,6 +35,7 @@ class DSPEmitter : public Gen::XCodeBlock
u16 compileSR; u16 compileSR;
DISALLOW_COPY_AND_ASSIGN(DSPEmitter); DISALLOW_COPY_AND_ASSIGN(DSPEmitter);
void ToMask(Gen::X64Reg value_reg = Gen::EDI, Gen::X64Reg temp_reg = Gen::ESI);
public: public:
DSPEmitter(); DSPEmitter();
~DSPEmitter(); ~DSPEmitter();

69
Source/Core/DSPCore/Src/Jit/DSPJitUtil.cpp
View File

@ -26,6 +26,22 @@
using namespace Gen; using namespace Gen;
// Performs the hashing required by increment/increase/decrease_addr_reg
void DSPEmitter::ToMask(X64Reg value_reg, X64Reg temp_reg)
{
MOV(16, R(temp_reg), R(value_reg));
SHR(16, R(temp_reg), Imm8(8));
OR(16, R(value_reg), R(temp_reg));
MOV(16, R(temp_reg), R(value_reg));
SHR(16, R(temp_reg), Imm8(4));
OR(16, R(value_reg), R(temp_reg));
MOV(16, R(temp_reg), R(value_reg));
SHR(16, R(temp_reg), Imm8(2));
OR(16, R(value_reg), R(temp_reg));
MOV(16, R(temp_reg), R(value_reg));
SHR(16, R(temp_reg), Imm8(1));
OR(16, R(value_reg), R(temp_reg));
}
// HORRIBLE UGLINESS, someone please fix. // HORRIBLE UGLINESS, someone please fix.
// See http://code.google.com/p/dolphin-emu/source/detail?r=3125 // See http://code.google.com/p/dolphin-emu/source/detail?r=3125
@ -39,19 +55,7 @@ void DSPEmitter::increment_addr_reg(int reg)
//ToMask(WR0), calculating it into EDI //ToMask(WR0), calculating it into EDI
MOV(16, R(EDI), R(EDX)); MOV(16, R(EDI), R(EDX));
ToMask(EDI);
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(8));
OR(16, R(EDI), R(ESI));
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(4));
OR(16, R(EDI), R(ESI));
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(2));
OR(16, R(EDI), R(ESI));
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(1));
OR(16, R(EDI), R(ESI));
// if ((tmp & tmb) == tmb) // if ((tmp & tmb) == tmb)
MOV(16, R(ESI), R(EAX)); MOV(16, R(ESI), R(EAX));
@ -111,7 +115,7 @@ void DSPEmitter::increase_addr_reg(int reg)
MOV(16, R(ECX), M(&g_dsp.r[DSP_REG_IX0 + reg])); MOV(16, R(ECX), M(&g_dsp.r[DSP_REG_IX0 + reg]));
//IX0 == 0, bail out //IX0 == 0, bail out
TEST(16, R(ECX), R(ECX)); TEST(16, R(ECX), R(ECX));
FixupBranch end = J_CC(CC_Z, true); FixupBranch end = J_CC(CC_Z);
MOV(16, R(EAX), M(&g_dsp.r[reg])); MOV(16, R(EAX), M(&g_dsp.r[reg]));
MOV(16, R(EDX), M(&g_dsp.r[DSP_REG_WR0 + reg])); MOV(16, R(EDX), M(&g_dsp.r[DSP_REG_WR0 + reg]));
@ -120,19 +124,7 @@ void DSPEmitter::increase_addr_reg(int reg)
//ToMask(WR0), calculating it into EDI //ToMask(WR0), calculating it into EDI
MOV(16, R(EDI), R(EDX)); MOV(16, R(EDI), R(EDX));
ToMask(EDI);
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(8));
OR(16, R(EDI), R(ESI));
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(4));
OR(16, R(EDI), R(ESI));
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(2));
OR(16, R(EDI), R(ESI));
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(1));
OR(16, R(EDI), R(ESI));
//dsp_increment //dsp_increment
JumpTarget loop_pos = GetCodePtr(); JumpTarget loop_pos = GetCodePtr();
@ -150,7 +142,7 @@ void DSPEmitter::increase_addr_reg(int reg)
ADD(16, R(EAX), Imm16(1)); ADD(16, R(EAX), Imm16(1));
SetJumpTarget(pos_eq); SetJumpTarget(pos_eq);
SUB(16, R(ECX), Imm16(1)); // value -- SUB(16, R(ECX), Imm16(1)); // value--
CMP(16, R(ECX), Imm16(0)); // value > 0 CMP(16, R(ECX), Imm16(0)); // value > 0
J_CC(CC_G, loop_pos); J_CC(CC_G, loop_pos);
FixupBranch end_pos = J(); FixupBranch end_pos = J();
@ -193,13 +185,12 @@ void DSPEmitter::decrease_addr_reg(int reg)
MOV(16, R(ECX), M(&g_dsp.r[DSP_REG_IX0 + reg])); MOV(16, R(ECX), M(&g_dsp.r[DSP_REG_IX0 + reg]));
//IX0 == 0, bail out //IX0 == 0, bail out
TEST(16, R(ECX), R(ECX)); TEST(16, R(ECX), R(ECX));
FixupBranch end = J_CC(CC_Z, true); FixupBranch end = J_CC(CC_Z);
MOV(16, R(EAX), M(&g_dsp.r[reg])); MOV(16, R(EAX), M(&g_dsp.r[reg]));
MOV(16, R(EDX), M(&g_dsp.r[DSP_REG_WR0 + reg])); MOV(16, R(EDX), M(&g_dsp.r[DSP_REG_WR0 + reg]));
//IX0 > 0 //IX0 > 0
FixupBranch neg = J_CC(CC_L); FixupBranch neg = J_CC(CC_L);
//dsp_increment
JumpTarget loop_pos = GetCodePtr(); JumpTarget loop_pos = GetCodePtr();
//dsp_decrement //dsp_decrement
@ -215,7 +206,7 @@ void DSPEmitter::decrease_addr_reg(int reg)
SUB(16, R(EAX), Imm16(1)); SUB(16, R(EAX), Imm16(1));
SetJumpTarget(neg_z); SetJumpTarget(neg_z);
SUB(16, R(ECX), Imm16(1)); // value -- SUB(16, R(ECX), Imm16(1)); // value--
CMP(16, R(ECX), Imm16(0)); // value > 0 CMP(16, R(ECX), Imm16(0)); // value > 0
J_CC(CC_G, loop_pos); J_CC(CC_G, loop_pos);
FixupBranch end_pos = J(); FixupBranch end_pos = J();
@ -225,21 +216,10 @@ void DSPEmitter::decrease_addr_reg(int reg)
//ToMask(WR0), calculating it into EDI //ToMask(WR0), calculating it into EDI
MOV(16, R(EDI), R(EDX)); MOV(16, R(EDI), R(EDX));
ToMask(EDI);
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(8));
OR(16, R(EDI), R(ESI));
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(4));
OR(16, R(EDI), R(ESI));
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(2));
OR(16, R(EDI), R(ESI));
MOV(16, R(ESI), R(EDI));
SHR(16, R(ESI), Imm8(1));
OR(16, R(EDI), R(ESI));
JumpTarget loop_neg = GetCodePtr(); JumpTarget loop_neg = GetCodePtr();
//dsp_increment
// if ((tmp & tmb) == tmb) // if ((tmp & tmb) == tmb)
MOV(16, R(ESI), R(EAX)); MOV(16, R(ESI), R(EAX));
AND(16, R(ESI), R(EDI)); AND(16, R(ESI), R(EDI));
@ -249,6 +229,7 @@ void DSPEmitter::decrease_addr_reg(int reg)
// tmp ^= wr_reg // tmp ^= wr_reg
XOR(16, R(EAX), R(EDX)); XOR(16, R(EAX), R(EDX));
FixupBranch pos_eq = J(); FixupBranch pos_eq = J();
SetJumpTarget(pos_neq); SetJumpTarget(pos_neq);
// else tmp++ // else tmp++
ADD(16, R(EAX), Imm16(1)); ADD(16, R(EAX), Imm16(1));