christoph/fail
1
Fork 0
Code Releases Activity

Merge "sal/bochs: force eflags after writing"

Browse Source
This commit is contained in:
Christian Dietrich
2013-07-03 13:08:39 +02:00
committed by Gerrit Code Review
parent 12f9915d1c 9b124fac8f
commit cfa311979e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/sal/bochs/BochsCPU.cc
View File

@ -10,8 +10,9 @@ regdata_t BochsCPU::getRegisterContent(const Register* reg) const
assert(reg != NULL && "FATAL ERROR: reg-ptr cannot be NULL!");
// TODO: BX_CPU(0) *always* correct?
if (reg->getId() == RID_FLAGS) // EFLAGS register?
return static_cast<regdata_t>(BX_CPU(id)->eflags);
if (reg->getId() == RID_FLAGS) { // EFLAGS register?
return static_cast<regdata_t>(BX_CPU(id)->read_eflags());
}
#ifdef SIM_SUPPORT_64
if (reg->getId() == RID_PC) // program counter?
@ -32,13 +33,15 @@ void BochsCPU::setRegisterContent(const Register* reg, regdata_t value)
// TODO: BX_CPU(0) *always* correct?
if (reg->getId() == RID_FLAGS) { // EFLAGS register?
regdata_t* pData = reinterpret_cast<regdata_t*>(&(BX_CPU(id)->eflags));
regdata_t regdata = getRegisterContent(reg);
#ifdef SIM_SUPPORT_64
// We are in 64 bit mode: Just assign the lower 32 bits!
*pData = ((*pData) & 0xFFFFFFFF00000000ULL) | (value & 0xFFFFFFFFULL);
BX_CPU(id)->writeEFlags((regdata & 0xFFFFFFFF00000000ULL) | (value & 0xFFFFFFFFULL),
0xffffffff);
#else
*pData = value;
BX_CPU(id)->writeEFlags(value, 0xffffffff);
#endif
BX_CPU(id)->force_flags();
return;
}