derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-arm: Call take(Virtual)Int only when needed

Browse Source 
There is no need to call the methods for every kind
of interrupt. A pending one should short-circuit the
remaining checks

Change-Id: I2c9eb680a7baa4644745b8cbe48183ff6f8e3102
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
This commit is contained in:
Giacomo Travaglini
2023-10-17 10:59:54 +01:00
parent bb323923f2
commit 49d07578de
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/arch/arm/interrupts.hh
View File

@@ -146,20 +146,15 @@ class Interrupts : public BaseInterrupts
if (!(intStatus || hcr.va || hcr.vi || hcr.vf))
return false;
bool take_irq = takeInt(INT_IRQ);
bool take_fiq = takeInt(INT_FIQ);
bool take_ea = takeInt(INT_ABT);
bool take_virq = takeVirtualInt(INT_VIRT_IRQ);
bool take_vfiq = takeVirtualInt(INT_VIRT_FIQ);
bool take_vabt = takeVirtualInt(INT_VIRT_ABT);
return ((interrupts[INT_IRQ] && take_irq) ||
(interrupts[INT_FIQ] && take_fiq) ||
(interrupts[INT_ABT] && take_ea) ||
((interrupts[INT_VIRT_IRQ] || hcr.vi) && take_virq) ||
((interrupts[INT_VIRT_FIQ] || hcr.vf) && take_vfiq) ||
(hcr.va && take_vabt) ||
(interrupts[INT_RST]) ||
return ((interrupts[INT_IRQ] && takeInt(INT_IRQ)) ||
(interrupts[INT_FIQ] && takeInt(INT_FIQ)) ||
(interrupts[INT_ABT] && takeInt(INT_ABT)) ||
((interrupts[INT_VIRT_IRQ] || hcr.vi) &&
takeVirtualInt(INT_VIRT_IRQ)) ||
((interrupts[INT_VIRT_FIQ] || hcr.vf) &&
takeVirtualInt(INT_VIRT_FIQ)) ||
(hcr.va && takeVirtualInt(INT_VIRT_ABT)) ||
(interrupts[INT_RST]) ||
(interrupts[INT_SEV])
);
}
@@ -224,24 +219,19 @@ class Interrupts : public BaseInterrupts
HCR hcr = tc->readMiscReg(MISCREG_HCR_EL2);
bool take_irq = takeInt(INT_IRQ);
bool take_fiq = takeInt(INT_FIQ);
bool take_ea = takeInt(INT_ABT);
bool take_virq = takeVirtualInt(INT_VIRT_IRQ);
bool take_vfiq = takeVirtualInt(INT_VIRT_FIQ);
bool take_vabt = takeVirtualInt(INT_VIRT_ABT);
if (interrupts[INT_IRQ] && take_irq)
if (interrupts[INT_IRQ] && takeInt(INT_IRQ))
return std::make_shared<Interrupt>();
if ((interrupts[INT_VIRT_IRQ] || hcr.vi) && take_virq)
if ((interrupts[INT_VIRT_IRQ] || hcr.vi) &&
takeVirtualInt(INT_VIRT_IRQ))
return std::make_shared<VirtualInterrupt>();
if (interrupts[INT_FIQ] && take_fiq)
if (interrupts[INT_FIQ] && takeInt(INT_FIQ))
return std::make_shared<FastInterrupt>();
if ((interrupts[INT_VIRT_FIQ] || hcr.vf) && take_vfiq)
if ((interrupts[INT_VIRT_FIQ] || hcr.vf) &&
takeVirtualInt(INT_VIRT_FIQ))
return std::make_shared<VirtualFastInterrupt>();
if (interrupts[INT_ABT] && take_ea)
if (interrupts[INT_ABT] && takeInt(INT_ABT))
return std::make_shared<SystemError>();
if (hcr.va && take_vabt)
if (hcr.va && takeVirtualInt(INT_VIRT_ABT))
return std::make_shared<VirtualDataAbort>(
0, TlbEntry::DomainType::NoAccess, false,
ArmFault::AsynchronousExternalAbort);