summaryrefslogtreecommitdiff
path: root/libpcsxcore/ppc
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-19 10:52:11 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-19 10:52:11 +0000
commit0956549379a239182714ca5f06bb40748e3a54a5 (patch)
treef3b4e0b2e5ef1125940ad6ae029ffdf066063484 /libpcsxcore/ppc
parentb24d4d3cd394aa86691d69156f3fb108c3537582 (diff)
downloadpcsxr-0956549379a239182714ca5f06bb40748e3a54a5.tar.gz
Use SDL for sound plugin, reverted the change to BIAS in r48024. (and I'm too lazy to hunt down the bug with x64 dynarec :( feel free to revert this revert if not preferred :P)
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48308 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/ppc')
-rw-r--r--libpcsxcore/ppc/pR3000A.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libpcsxcore/ppc/pR3000A.c b/libpcsxcore/ppc/pR3000A.c
index 93745f82..d0037b64 100644
--- a/libpcsxcore/ppc/pR3000A.c
+++ b/libpcsxcore/ppc/pR3000A.c
@@ -741,7 +741,7 @@ static void Return()
static void iRet() {
/* store cycle */
- count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
+ count = idlecyclecount + (pc - pcold)/4;
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
Return();
}
@@ -793,7 +793,7 @@ static void SetBranch() {
LIW(0, psxRegs.code);
STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
/* store cycle */
- count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
+ count = idlecyclecount + (pc - pcold)/4;
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
treg = GetHWRegSpecial(TARGET);
@@ -816,7 +816,7 @@ static void SetBranch() {
DisposeHWReg(GetHWRegFromCPUReg(treg));
FlushAllHWReg();
- count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
+ count = idlecyclecount + (pc - pcold)/4;
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
FlushAllHWReg();
CALLFunc((u32)psxBranchTest);
@@ -836,7 +836,7 @@ static void iJump(u32 branchPC) {
LIW(0, psxRegs.code);
STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
/* store cycle */
- count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
+ count = idlecyclecount + (pc - pcold)/4;
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
LIW(PutHWRegSpecial(ARG2), branchPC);
@@ -855,7 +855,7 @@ static void iJump(u32 branchPC) {
LIW(PutHWRegSpecial(PSXPC), branchPC);
FlushAllHWReg();
- count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
+ count = idlecyclecount + (pc - pcold)/4;
//if (/*psxRegs.code == 0 &&*/ count == 2 && branchPC == pcold) {
// LIW(PutHWRegSpecial(CYCLECOUNT), 0);
//} else {
@@ -916,7 +916,7 @@ static void iBranch(u32 branchPC, int savectx) {
LIW(0, psxRegs.code);
STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
/* store cycle */
- count = (idlecyclecount + ((pc+4) - pcold) / 4) * BIAS;
+ count = idlecyclecount + ((pc+4) - pcold)/4;
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
LIW(PutHWRegSpecial(ARG2), branchPC);
@@ -937,7 +937,7 @@ static void iBranch(u32 branchPC, int savectx) {
FlushAllHWReg();
/* store cycle */
- count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
+ count = idlecyclecount + (pc - pcold)/4;
//if (/*psxRegs.code == 0 &&*/ count == 2 && branchPC == pcold) {
// LIW(PutHWRegSpecial(CYCLECOUNT), 0);
//} else {
@@ -3324,7 +3324,7 @@ static void recHLE() {
CALLFunc((u32)psxHLEt[0]); // call dummy function
}
- count = (idlecyclecount + (pc - pcold) / 4 + 20) * BIAS;
+ count = idlecyclecount + (pc - pcold)/4 + 20;
ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
FlushAllHWReg();
CALLFunc((u32)psxBranchTest);