christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Merge branch 'bochs-catchall-io'

Browse Source
This commit is contained in:
Horst Schirmeier
2014-07-18 15:00:16 +02:00
parent b61f83bed2 c2eb718886
commit 84b7a1d08a
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/sal/bochs/IOPortCom.ah
View File

@ -12,29 +12,33 @@
#include "../SALInst.hpp" #include "../SALInst.hpp"
#include "BochsHelpers.hpp" #include "BochsHelpers.hpp"
// TODO: ATM only capturing bytewise output (most common, I suppose) // FIXME ATM only capturing the first byte of a multi-byte in/out
aspect IOPortCom { aspect IOPortCom {
pointcut outInstruction() = "% ...::bx_cpu_c::OUT_DXAL(...)"; pointcut devices_outp() = "% ...::bx_devices_c::outp(...)";
advice execution (outInstruction()) : after () advice call (devices_outp()) && within ("...::bx_cpu_c") : before ()
{ {
unsigned rDX = getCPU(tjp->that())->gen_reg[2].word.rx; // port number unsigned port = *(tjp->arg<0>());
unsigned char rAL = getCPU(tjp->that())->gen_reg[0].word.byte.rl; // data unsigned data = *(tjp->arg<1>());
// Detect the CPU that triggered the change: // detect the CPU that triggered the access
fail::ConcreteCPU& triggerCPU = fail::simulator.detectCPU(getCPU(tjp->that())); fail::ConcreteCPU& triggerCPU = fail::simulator.detectCPU(getCPU(tjp->that()));
fail::simulator.onIOPort(&triggerCPU, rAL, rDX, true); // forward to SimulatorController
fail::simulator.onIOPort(&triggerCPU, data, port, true);
} }
pointcut inInstruction() = "% ...::bx_cpu_c::IN_ALDX(...)"; pointcut devices_inp() = "% ...::bx_devices_c::inp(...)";
advice execution (inInstruction()) : after () advice call (devices_inp()) && within ("...::bx_cpu_c") : after ()
{ {
unsigned rDX = getCPU(tjp->that())->gen_reg[2].word.rx; // port number unsigned port = *(tjp->arg<0>());
unsigned char rAL = getCPU(tjp->that())->gen_reg[0].word.byte.rl; // data unsigned data = *(tjp->result());
// detect the CPU that triggered the access
fail::ConcreteCPU& triggerCPU = fail::simulator.detectCPU(getCPU(tjp->that())); fail::ConcreteCPU& triggerCPU = fail::simulator.detectCPU(getCPU(tjp->that()));
fail::simulator.onIOPort(&triggerCPU, rAL, rDX, false); // forward to SimulatorController
fail::simulator.onIOPort(&triggerCPU, data, port, false);
} }
}; };