diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/kvm/gic.cc | 8 | ||||
| -rw-r--r-- | src/arch/arm/linux/system.cc | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/arch/arm/kvm/gic.cc b/src/arch/arm/kvm/gic.cc index 887fa8d69..d2423a6ec 100644 --- a/src/arch/arm/kvm/gic.cc +++ b/src/arch/arm/kvm/gic.cc @@ -305,7 +305,7 @@ void MuxingKvmGic::copyBankedDistRange(BaseGicRegisters* from, BaseGicRegisters* to, Addr daddr, size_t size) { - for (int ctx = 0; ctx < system._numContexts; ++ctx) + for (int ctx = 0; ctx < system.numContexts(); ++ctx) for (auto a = daddr; a < daddr + size; a += 4) copyDistRegister(from, to, ctx, a); } @@ -314,7 +314,7 @@ void MuxingKvmGic::clearBankedDistRange(BaseGicRegisters* to, Addr daddr, size_t size) { - for (int ctx = 0; ctx < system._numContexts; ++ctx) + for (int ctx = 0; ctx < system.numContexts(); ++ctx) for (auto a = daddr; a < daddr + size; a += 4) to->writeDistributor(ctx, a, 0xFFFFFFFF); } @@ -345,7 +345,7 @@ MuxingKvmGic::copyGicState(BaseGicRegisters* from, BaseGicRegisters* to) // Copy CPU Interface Control Register (CTLR), // Interrupt Priority Mask Register (PMR), and // Binary Point Register (BPR) - for (int ctx = 0; ctx < system._numContexts; ++ctx) { + for (int ctx = 0; ctx < system.numContexts(); ++ctx) { copyCpuRegister(from, to, ctx, GICC_CTLR); copyCpuRegister(from, to, ctx, GICC_PMR); copyCpuRegister(from, to, ctx, GICC_BPR); @@ -423,7 +423,7 @@ MuxingKvmGic::fromKvmToPl390() // have been shifted by three bits due to its having been emulated by // a VGIC with only 5 PMR bits in its VMCR register. Presently the // Linux kernel does not repair this inaccuracy, so we correct it here. - for (int cpu = 0; cpu < system._numContexts; ++cpu) { + for (int cpu = 0; cpu < system.numContexts(); ++cpu) { cpuPriority[cpu] <<= 3; assert((cpuPriority[cpu] & ~0xff) == 0); } diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc index 7f0647512..094e4d7a7 100644 --- a/src/arch/arm/linux/system.cc +++ b/src/arch/arm/linux/system.cc @@ -250,8 +250,7 @@ LinuxArmSystem::startup() std::string task_filename = "tasks.txt"; taskFile = simout.create(name() + "." + task_filename); - for (int i = 0; i < _numContexts; i++) { - ThreadContext *tc = threadContexts[i]; + for (const auto tc : threadContexts) { uint32_t pid = tc->getCpuPtr()->getPid(); if (pid != BaseCPU::invldPid) { mapPid(tc, pid); |