Skip to content

Commit 3cce74e

Browse files
committed
Revert DSP.cpp 'fixes' from last upstream merge that break game loading and audio
These hang the emulator and games cannot load http://sourceforge.net/p/fourdo/code/362/
1 parent 87b21ea commit 3cce74e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libfreedo/DSP.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,7 @@ unsigned int _dsp_ARMread2sema4(void)
11761176
}else if ((operand.nrof.TYPE&6)==6)
11771177
{
11781178
//case 6: and case 7: immediate format
1179-
OperandPool[Operands]=operand.iof.IMMEDIATE<<(~((operand.iof.JUSTIFY)+1)&3);
1179+
OperandPool[Operands]=operand.iof.IMMEDIATE<<(operand.iof.JUSTIFY&3);
11801180
flags.WRITEBACK=OperandPool[Operands++];
11811181

11821182
}else if(!(operand.nrof.TYPE&4)) // case 0..3
@@ -1280,7 +1280,7 @@ int __fastcall OperandLoaderNWB(void)
12801280
}else if ((operand.nrof.TYPE&6)==6)
12811281
{
12821282
//case 6: and case 7: immediate format
1283-
Operand=operand.iof.IMMEDIATE<<(~((operand.iof.JUSTIFY)+1)&3);
1283+
Operand=operand.iof.IMMEDIATE<<(operand.iof.JUSTIFY&3);
12841284

12851285
}else if(operand.nrof.TYPE==5)
12861286
{ //if(operand.r2of.NUMREGS) ignore... It's right?

0 commit comments

Comments
 (0)