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

Merge branch 'master' of https://github.com/PatrickvL/Cxbx-Reloaded.git

This commit is contained in:
PatrickvL 2016-12-02 08:58:07 +01:00
parent 56185eed5f 7bb8c658c8
commit 3e1695e54d
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/CxbxKrnl/EmuX86.cpp
View File

@ -165,8 +165,6 @@ bool EmuX86_MOV(LPEXCEPTION_POINTERS e, Zydis::InstructionInfo& info)
default: default:
return false; return false;
} }
return true;
} }
else if (info.operand[0].type == Zydis::OperandType::MEMORY && info.operand[1].type == Zydis::OperandType::REGISTER) else if (info.operand[0].type == Zydis::OperandType::MEMORY && info.operand[1].type == Zydis::OperandType::REGISTER)
{ {
@ -194,8 +192,6 @@ bool EmuX86_MOV(LPEXCEPTION_POINTERS e, Zydis::InstructionInfo& info)
default: default:
return false; return false;
} }
return true;
} }
else if (info.operand[0].type == Zydis::OperandType::MEMORY && info.operand[1].type == Zydis::OperandType::IMMEDIATE) else if (info.operand[0].type == Zydis::OperandType::MEMORY && info.operand[1].type == Zydis::OperandType::IMMEDIATE)
{ {
@ -218,11 +214,19 @@ bool EmuX86_MOV(LPEXCEPTION_POINTERS e, Zydis::InstructionInfo& info)
default: default:
return false; return false;
} }
return true;
} }
else
return false; return false;
/* TODO : What flags need to be set at a successfull MOV ?
EmuX86_SetFlag(e, EMUX86_EFLAG_CF, 0);
EmuX86_SetFlag(e, EMUX86_EFLAG_OF, 0);
EmuX86_SetFlag(e, EMUX86_EFLAG_SF, 0);
EmuX86_SetFlag(e, EMUX86_EFLAG_ZF, 0);
EmuX86_SetFlag(e, EMUX86_EFLAG_PF, 0);
*/
return true;
} }
inline void EmuX86_SetFlag(LPEXCEPTION_POINTERS e, int flag, int value) inline void EmuX86_SetFlag(LPEXCEPTION_POINTERS e, int flag, int value)
@ -273,17 +277,16 @@ bool EmuX86_TEST(LPEXCEPTION_POINTERS e, Zydis::InstructionInfo& info)
} }
// Set CF/OF to 0 // Set CF/OF to 0
// TODO FIXME using http://www.emulators.com/docs/nx11_flags.htm#Faster_Lazy_Evaluation
EmuX86_SetFlag(e, EMUX86_EFLAG_CF, 0); EmuX86_SetFlag(e, EMUX86_EFLAG_CF, 0);
EmuX86_SetFlag(e, EMUX86_EFLAG_OF, 0); EmuX86_SetFlag(e, EMUX86_EFLAG_OF, 0);
EmuX86_SetFlag(e, EMUX86_EFLAG_SF, result >> 31); EmuX86_SetFlag(e, EMUX86_EFLAG_SF, result >> 31);
EmuX86_SetFlag(e, EMUX86_EFLAG_ZF, result == 0 ? 1 : 0); EmuX86_SetFlag(e, EMUX86_EFLAG_ZF, result == 0 ? 1 : 0);
// Set Parity Flag using "Compute parity in parallel" : // Set Parity flag, based on "Compute parity in parallel" method from
// Source : http://graphics.stanford.edu/~seander/bithacks.html#ParityParallel // http://graphics.stanford.edu/~seander/bithacks.html#ParityParallel
uint32_t v = result; // word value to compute the parity of uint32_t v = 255 & result;
v ^= v >> 16;
v ^= v >> 8;
v ^= v >> 4; v ^= v >> 4;
v &= 0xf; v &= 0xf;
EmuX86_SetFlag(e, EMUX86_EFLAG_PF, (0x6996 >> v) & 1); EmuX86_SetFlag(e, EMUX86_EFLAG_PF, (0x6996 >> v) & 1);