christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Namespaces unified (sal+fi -> fail), Code cleanups (-> coding-style.txt), Doxygen-comments fixed.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1319 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-06-07 17:47:19 +00:00
parent cdd5379e19
commit b7d904140e
136 changed files with 1487 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/SAL/bochs/fireInterrupt.ah
View File

@ -16,11 +16,11 @@ aspect fireInterrupt
advice execution (cpuLoop()) : before ()
{
if (!sal::interrupt_injection_request) {
if (!fail::interrupt_injection_request) {
return;
}else{
BX_SET_INTR(sal::interrupt_to_fire);
DEV_pic_raise_irq(sal::interrupt_to_fire);
BX_SET_INTR(fail::interrupt_to_fire);
DEV_pic_raise_irq(fail::interrupt_to_fire);
}
}
};
@ -32,12 +32,12 @@ aspect InterruptDone
advice execution (interrupt_method()) : before ()
{
if (!sal::interrupt_injection_request) {
if (!fail::interrupt_injection_request) {
return;
}else{
if(*(tjp->arg<0>()) == 32 + sal::interrupt_to_fire){
DEV_pic_lower_irq(sal::interrupt_to_fire);
sal::simulator.fireInterruptDone();
if(*(tjp->arg<0>()) == 32 + fail::interrupt_to_fire){
DEV_pic_lower_irq(fail::interrupt_to_fire);
fail::simulator.fireInterruptDone();
}
}
}
@ -45,4 +45,4 @@ aspect InterruptDone
#endif // CONFIG_FIRE_INTERRUPTS
#endif /* __FIREINTERRUPT_AH__ */
#endif // __FIREINTERRUPT_AH__