christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

++coding-style.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1388 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-06-27 11:27:06 +00:00
parent ac5dee6549
commit fe915e7d52
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/sal/bochs/BochsController.cc
View File

@ -29,8 +29,7 @@ BochsController::BochsController()
const std::string names[] = { "RAX", "RCX", "RDX", "RBX", "RSP", "RBP", "RSI", const std::string names[] = { "RAX", "RCX", "RDX", "RBX", "RSP", "RBP", "RSI",
"RDI", "R8", "R9", "R10", "R11", "R12", "R13", "RDI", "R8", "R9", "R10", "R11", "R12", "R13",
"R14", "R15" }; "R14", "R15" };
for(unsigned short i = 0; i < 16; i++) for (unsigned short i = 0; i < 16; i++) {
{
BxGPReg* pReg = new BxGPReg(i, 64, &(BX_CPU(0)->gen_reg[i].rrx)); BxGPReg* pReg = new BxGPReg(i, 64, &(BX_CPU(0)->gen_reg[i].rrx));
pReg->setName(names[i]); pReg->setName(names[i]);
m_Regs->add(pReg); m_Regs->add(pReg);
@ -39,8 +38,7 @@ BochsController::BochsController()
// -- 32 bit register -- // -- 32 bit register --
const std::string names[] = { "EAX", "ECX", "EDX", "EBX", "ESP", "EBP", "ESI", const std::string names[] = { "EAX", "ECX", "EDX", "EBX", "ESP", "EBP", "ESI",
"EDI" }; "EDI" };
for(unsigned short i = 0; i < 8; i++) for (unsigned short i = 0; i < 8; i++) {
{
BxGPReg* pReg = new BxGPReg(i, 32, &(BX_CPU(0)->gen_reg[i].dword.erx)); BxGPReg* pReg = new BxGPReg(i, 32, &(BX_CPU(0)->gen_reg[i].dword.erx));
pReg->setName(names[i]); pReg->setName(names[i]);
m_Regs->add(pReg); m_Regs->add(pReg);
@ -94,7 +92,7 @@ void BochsController::onInstrPtrChanged(address_t instrPtr, address_t address_sp
BX_CPU_C *context, bxICacheEntry_c *cache_entry) BX_CPU_C *context, bxICacheEntry_c *cache_entry)
{ {
#ifdef DEBUG #ifdef DEBUG
if(m_Regularity != 0 && ++m_Counter % m_Regularity == 0) if (m_Regularity != 0 && ++m_Counter % m_Regularity == 0)
(*m_pDest) << "0x" << std::hex << instrPtr; (*m_pDest) << "0x" << std::hex << instrPtr;
#endif #endif
assert(context != NULL && "FATAL ERROR: Bochs internal member was NULL (not expected)!"); assert(context != NULL && "FATAL ERROR: Bochs internal member was NULL (not expected)!");
@ -105,11 +103,9 @@ void BochsController::onInstrPtrChanged(address_t instrPtr, address_t address_sp
// Check for active breakpoint-events: // Check for active breakpoint-events:
bp_cache_t &buffer_cache = m_EvList.getBPBuffer(); bp_cache_t &buffer_cache = m_EvList.getBPBuffer();
bp_cache_t::iterator it = buffer_cache.begin(); bp_cache_t::iterator it = buffer_cache.begin();
while(it != buffer_cache.end()) while (it != buffer_cache.end()) {
{
BPEvent* pEvBreakpt = *it; BPEvent* pEvBreakpt = *it;
if(pEvBreakpt->isMatching(instrPtr, address_space)) if (pEvBreakpt->isMatching(instrPtr, address_space)) {
{
pEvBreakpt->setTriggerInstructionPointer(instrPtr); pEvBreakpt->setTriggerInstructionPointer(instrPtr);
it = buffer_cache.makeActive(m_EvList, it); it = buffer_cache.makeActive(m_EvList, it);
do_fire = true; do_fire = true;
@ -119,7 +115,7 @@ void BochsController::onInstrPtrChanged(address_t instrPtr, address_t address_sp
} }
it++; it++;
} }
if(do_fire) if (do_fire)
m_EvList.fireActiveEvents(); m_EvList.fireActiveEvents();
// Note: SimulatorController::onBreakpointEvent will not be invoked in this // Note: SimulatorController::onBreakpointEvent will not be invoked in this
// implementation. // implementation.
@ -129,11 +125,9 @@ void BochsController::onIOPortEvent(unsigned char data, unsigned port, bool out)
// Check for active breakpoint-events: // Check for active breakpoint-events:
io_cache_t &buffer_cache = m_EvList.getIOBuffer(); io_cache_t &buffer_cache = m_EvList.getIOBuffer();
io_cache_t::iterator it = buffer_cache.begin(); io_cache_t::iterator it = buffer_cache.begin();
while(it != buffer_cache.end()) while (it != buffer_cache.end()) {
{
IOPortEvent* pIOPt = (*it); IOPortEvent* pIOPt = (*it);
if(pIOPt->isMatching(port, out)) if (pIOPt->isMatching(port, out)) {
{
pIOPt->setData(data); pIOPt->setData(data);
it = buffer_cache.makeActive(m_EvList, it); it = buffer_cache.makeActive(m_EvList, it);
// "it" has already been set to the next element (by calling // "it" has already been set to the next element (by calling
@ -152,7 +146,7 @@ void BochsController::save(const std::string& path)
int stat; int stat;
stat = mkdir(path.c_str(), 0777); stat = mkdir(path.c_str(), 0777);
if(!(stat == 0 || errno == EEXIST)) if (!(stat == 0 || errno == EEXIST))
std::cout << "[FAIL] Can not create target-directory to save!" << std::endl; std::cout << "[FAIL] Can not create target-directory to save!" << std::endl;
// TODO: (Non-)Verbose-Mode? Log-level? Maybe better: use return value to indicate failure? // TODO: (Non-)Verbose-Mode? Log-level? Maybe better: use return value to indicate failure?