From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Sat, 13 Jul 2013 01:22:25 +0000 (-0700)
Subject: Favor procs.size() over num_cores()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b6da69bb3e38ca27b5826bb36f68fd6426f9e688;p=riscv-isa-sim.git

Favor procs.size() over num_cores()
---

diff --git a/riscv/sim.cc b/riscv/sim.cc
index 805429a..8df943c 100644
--- a/riscv/sim.cc
+++ b/riscv/sim.cc
@@ -40,13 +40,15 @@ sim_t::sim_t(int _nprocs, int mem_mb, const std::vector<std::string>& args)
 
   mmu = new mmu_t(mem, memsz);
 
-  for(size_t i = 0; i < num_cores(); i++)
+  if (_nprocs == 0)
+    _nprocs = 1;
+  for (size_t i = 0; i < _nprocs; i++)
     procs[i] = new processor_t(this, new mmu_t(mem, memsz), i);
 }
 
 sim_t::~sim_t()
 {
-  for(size_t i = 0; i < num_cores(); i++)
+  for (size_t i = 0; i < procs.size(); i++)
   {
     mmu_t* pmmu = &procs[i]->mmu;
     delete procs[i];
@@ -58,7 +60,7 @@ sim_t::~sim_t()
 
 void sim_t::send_ipi(reg_t who)
 {
-  if(who < num_cores())
+  if (who < procs.size())
     procs[who]->deliver_ipi();
 }