diff options
| author | Gabe Black <gabeblack@google.com> | 2019-09-11 13:26:09 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-09-21 05:05:18 +0000 |
| commit | e6c6f0601cff25bb0b9e11a7bed56f77735b21db (patch) | |
| tree | 411af86137f04e752eee73c9893c7b8b0a7c751c /src/arch/x86 | |
| parent | cc03cf8270fad7261f08527637325cb42615c887 (diff) | |
| download | gem5-e6c6f0601cff25bb0b9e11a7bed56f77735b21db.tar.xz | |
x86: Templatize the IntMasterPort.
This makes the IntMasterPort usable with any class, making it possible
to avoid inheriting from IntDevice.
It also makes IntMasterPort inherit directly from QueuedMasterPort,
skipping over MessageMasterPort.
Change-Id: I9d218556c838ea567ced5f6fa4d57a3ec9d28d31
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20821
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/interrupts.cc | 4 | ||||
| -rw-r--r-- | src/arch/x86/interrupts.hh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc index b7d023537..402b91200 100644 --- a/src/arch/x86/interrupts.cc +++ b/src/arch/x86/interrupts.cc @@ -331,7 +331,7 @@ X86ISA::Interrupts::recvMessage(PacketPtr pkt) } -Tick +bool X86ISA::Interrupts::recvResponse(PacketPtr pkt) { assert(!pkt->isError()); @@ -343,7 +343,7 @@ X86ISA::Interrupts::recvResponse(PacketPtr pkt) regs[APIC_INTERRUPT_COMMAND_LOW] = low; } DPRINTF(LocalApic, "ICR is now idle.\n"); - return 0; + return true; } diff --git a/src/arch/x86/interrupts.hh b/src/arch/x86/interrupts.hh index 48e350cfc..e48fd4bb3 100644 --- a/src/arch/x86/interrupts.hh +++ b/src/arch/x86/interrupts.hh @@ -205,7 +205,7 @@ class Interrupts : public PioDevice, IntDevice Tick read(PacketPtr pkt) override; Tick write(PacketPtr pkt) override; Tick recvMessage(PacketPtr pkt); - Tick recvResponse(PacketPtr pkt) override; + bool recvResponse(PacketPtr pkt) override; bool triggerTimerInterrupt() |