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

[Android] Fix bug in CArmOps::ThumbCompressConst and add another case

This commit is contained in:
zilmar 2016-11-25 17:34:01 +11:00
parent d08f1df674
commit 10ae0da041
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp
View File

@ -1386,12 +1386,20 @@ uint16_t CArmOps::ThumbCompressConst (uint32_t value)
return (uint16_t)((value & 0xFF)); return (uint16_t)((value & 0xFF));
} }
//'00000000 nnnnnnnn 00000000 nnnnnnnn'
if (((value >> 24) & 0xFF) == 0 &&
((value >> 16) & 0xFF) == (value & 0xFF) &&
((value >> 8) & 0xFF) == 0)
{
return (uint16_t)(0x100 | (value & 0xFF));
}
//'nnnnnnnn 00000000 nnnnnnnn 00000000' //'nnnnnnnn 00000000 nnnnnnnn 00000000'
if (((value >> 24) & 0xFF) == ((value >> 8) & 0xFF) && if (((value >> 24) & 0xFF) == ((value >> 8) & 0xFF) &&
((value >> 16) & 0xFF) == 0 && ((value >> 16) & 0xFF) == 0 &&
(value & 0xFF) == 0) (value & 0xFF) == 0)
{ {
return (uint16_t)(0x200 | (value & 0xFF)); return (uint16_t)(0x200 | ((value >> 8) & 0xFF));
} }
//'nnnnnnnn nnnnnnnn nnnnnnnn nnnnnnnn' //'nnnnnnnn nnnnnnnn nnnnnnnn nnnnnnnn'