diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2012-07-09 12:35:34 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-07-09 12:35:34 -0400 |
| commit | 46d9adb68c96b94ae25bbe92d34e375daf532ece (patch) | |
| tree | 8a0792d1d67958eeb65ee978edc5217e2b499ae7 /src/arch/x86 | |
| parent | 830391cad9764b923edd8f761e9fe5d11fd9d837 (diff) | |
| download | gem5-46d9adb68c96b94ae25bbe92d34e375daf532ece.tar.xz | |
Port: Make getAddrRanges const
This patch makes getAddrRanges const throughout the code base. There
is no reason why it should not be, and making it const prevents adding
any unintentional side-effects.
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/interrupts.cc | 6 | ||||
| -rw-r--r-- | src/arch/x86/interrupts.hh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc index a422a4758..b418a7489 100644 --- a/src/arch/x86/interrupts.cc +++ b/src/arch/x86/interrupts.cc @@ -303,6 +303,7 @@ X86ISA::Interrupts::setCPU(BaseCPU * newCPU) cpu = newCPU; initialApicId = cpu->cpuId(); regs[APIC_ID] = (initialApicId << 24); + pioAddr = x86LocalAPICAddress(initialApicId, 0); } @@ -367,20 +368,19 @@ X86ISA::Interrupts::recvResponse(PacketPtr pkt) AddrRangeList -X86ISA::Interrupts::getAddrRanges() +X86ISA::Interrupts::getAddrRanges() const { AddrRangeList ranges; Range<Addr> range = RangeEx(x86LocalAPICAddress(initialApicId, 0), x86LocalAPICAddress(initialApicId, 0) + PageBytes); ranges.push_back(range); - pioAddr = range.start; return ranges; } AddrRangeList -X86ISA::Interrupts::getIntAddrRange() +X86ISA::Interrupts::getIntAddrRange() const { AddrRangeList ranges; ranges.push_back(RangeEx(x86InterruptAddress(initialApicId, 0), diff --git a/src/arch/x86/interrupts.hh b/src/arch/x86/interrupts.hh index 328e7159d..1b7f5a52c 100644 --- a/src/arch/x86/interrupts.hh +++ b/src/arch/x86/interrupts.hh @@ -236,8 +236,8 @@ class Interrupts : public BasicPioDevice, IntDev return entry.periodic; } - AddrRangeList getAddrRanges(); - AddrRangeList getIntAddrRange(); + AddrRangeList getAddrRanges() const; + AddrRangeList getIntAddrRange() const; MasterPort &getMasterPort(const std::string &if_name, int idx = -1) { |