summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2008-07-11 08:52:50 -0700
committerNathan Binkert <nate@binkert.org>2008-07-11 08:52:50 -0700
commit88766f7c7116d148c5bb47bffa2d76d8c1203b88 (patch)
tree8401a0db00db732c4e891bcac1c500c26bb711d7
parentf90b08a5ccd83800e0263e6e13af7d8c87b3cdf4 (diff)
downloadgem5-88766f7c7116d148c5bb47bffa2d76d8c1203b88.tar.xz
style: fix indentation and formatting of the pseudo insts.
-rw-r--r--src/sim/pseudo_inst.cc389
-rw-r--r--src/sim/pseudo_inst.hh56
2 files changed, 225 insertions, 220 deletions
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 157d39e93..ec384a4c5 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -55,255 +55,258 @@ using namespace std;
using namespace Stats;
using namespace TheISA;
-namespace PseudoInst
+namespace PseudoInst {
+
+void
+arm(ThreadContext *tc)
{
- void
- arm(ThreadContext *tc)
- {
- if (tc->getKernelStats())
- tc->getKernelStats()->arm();
- }
+ if (tc->getKernelStats())
+ tc->getKernelStats()->arm();
+}
- void
- quiesce(ThreadContext *tc)
- {
- if (!tc->getCpuPtr()->params->do_quiesce)
- return;
+void
+quiesce(ThreadContext *tc)
+{
+ if (!tc->getCpuPtr()->params->do_quiesce)
+ return;
- DPRINTF(Quiesce, "%s: quiesce()\n", tc->getCpuPtr()->name());
+ DPRINTF(Quiesce, "%s: quiesce()\n", tc->getCpuPtr()->name());
- tc->suspend();
- if (tc->getKernelStats())
- tc->getKernelStats()->quiesce();
- }
+ tc->suspend();
+ if (tc->getKernelStats())
+ tc->getKernelStats()->quiesce();
+}
- void
- quiesceNs(ThreadContext *tc, uint64_t ns)
- {
- if (!tc->getCpuPtr()->params->do_quiesce || ns == 0)
- return;
+void
+quiesceNs(ThreadContext *tc, uint64_t ns)
+{
+ if (!tc->getCpuPtr()->params->do_quiesce || ns == 0)
+ return;
- EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
+ EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
- Tick resume = curTick + Clock::Int::ns * ns;
+ Tick resume = curTick + Clock::Int::ns * ns;
- quiesceEvent->reschedule(resume, true);
+ quiesceEvent->reschedule(resume, true);
- DPRINTF(Quiesce, "%s: quiesceNs(%d) until %d\n",
- tc->getCpuPtr()->name(), ns, resume);
+ DPRINTF(Quiesce, "%s: quiesceNs(%d) until %d\n",
+ tc->getCpuPtr()->name(), ns, resume);
- tc->suspend();
- if (tc->getKernelStats())
- tc->getKernelStats()->quiesce();
- }
+ tc->suspend();
+ if (tc->getKernelStats())
+ tc->getKernelStats()->quiesce();
+}
- void
- quiesceCycles(ThreadContext *tc, uint64_t cycles)
- {
- if (!tc->getCpuPtr()->params->do_quiesce || cycles == 0)
- return;
+void
+quiesceCycles(ThreadContext *tc, uint64_t cycles)
+{
+ if (!tc->getCpuPtr()->params->do_quiesce || cycles == 0)
+ return;
- EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
+ EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
- Tick resume = curTick + tc->getCpuPtr()->ticks(cycles);
+ Tick resume = curTick + tc->getCpuPtr()->ticks(cycles);
- quiesceEvent->reschedule(resume, true);
+ quiesceEvent->reschedule(resume, true);
- DPRINTF(Quiesce, "%s: quiesceCycles(%d) until %d\n",
- tc->getCpuPtr()->name(), cycles, resume);
+ DPRINTF(Quiesce, "%s: quiesceCycles(%d) until %d\n",
+ tc->getCpuPtr()->name(), cycles, resume);
- tc->suspend();
- if (tc->getKernelStats())
- tc->getKernelStats()->quiesce();
- }
+ tc->suspend();
+ if (tc->getKernelStats())
+ tc->getKernelStats()->quiesce();
+}
- uint64_t
- quiesceTime(ThreadContext *tc)
- {
- return (tc->readLastActivate() - tc->readLastSuspend()) / Clock::Int::ns;
- }
+uint64_t
+quiesceTime(ThreadContext *tc)
+{
+ return (tc->readLastActivate() - tc->readLastSuspend()) / Clock::Int::ns;
+}
- void
- m5exit_old(ThreadContext *tc)
- {
- exitSimLoop("m5_exit_old instruction encountered");
- }
+void
+m5exit_old(ThreadContext *tc)
+{
+ exitSimLoop("m5_exit_old instruction encountered");
+}
- void
- m5exit(ThreadContext *tc, Tick delay)
- {
- Tick when = curTick + delay * Clock::Int::ns;
- schedExitSimLoop("m5_exit instruction encountered", when);
- }
+void
+m5exit(ThreadContext *tc, Tick delay)
+{
+ Tick when = curTick + delay * Clock::Int::ns;
+ schedExitSimLoop("m5_exit instruction encountered", when);
+}
- void
- loadsymbol(ThreadContext *tc)
- {
- const string &filename = tc->getCpuPtr()->system->params()->symbolfile;
- if (filename.empty()) {
- return;
- }
+void
+loadsymbol(ThreadContext *tc)
+{
+ const string &filename = tc->getCpuPtr()->system->params()->symbolfile;
+ if (filename.empty()) {
+ return;
+ }
- std::string buffer;
- ifstream file(filename.c_str());
+ std::string buffer;
+ ifstream file(filename.c_str());
- if (!file)
- fatal("file error: Can't open symbol table file %s\n", filename);
+ if (!file)
+ fatal("file error: Can't open symbol table file %s\n", filename);
- while (!file.eof()) {
- getline(file, buffer);
+ while (!file.eof()) {
+ getline(file, buffer);
- if (buffer.empty())
- continue;
+ if (buffer.empty())
+ continue;
- int idx = buffer.find(' ');
- if (idx == string::npos)
- continue;
+ int idx = buffer.find(' ');
+ if (idx == string::npos)
+ continue;
- string address = "0x" + buffer.substr(0, idx);
- eat_white(address);
- if (address.empty())
- continue;
+ string address = "0x" + buffer.substr(0, idx);
+ eat_white(address);
+ if (address.empty())
+ continue;
- // Skip over letter and space
- string symbol = buffer.substr(idx + 3);
- eat_white(symbol);
- if (symbol.empty())
- continue;
+ // Skip over letter and space
+ string symbol = buffer.substr(idx + 3);
+ eat_white(symbol);
+ if (symbol.empty())
+ continue;
- Addr addr;
- if (!to_number(address, addr))
- continue;
+ Addr addr;
+ if (!to_number(address, addr))
+ continue;
- if (!tc->getSystemPtr()->kernelSymtab->insert(addr, symbol))
- continue;
+ if (!tc->getSystemPtr()->kernelSymtab->insert(addr, symbol))
+ continue;
- DPRINTF(Loader, "Loaded symbol: %s @ %#llx\n", symbol, addr);
- }
- file.close();
+ DPRINTF(Loader, "Loaded symbol: %s @ %#llx\n", symbol, addr);
}
+ file.close();
+}
- void
- resetstats(ThreadContext *tc, Tick delay, Tick period)
- {
- if (!tc->getCpuPtr()->params->do_statistics_insts)
- return;
+void
+resetstats(ThreadContext *tc, Tick delay, Tick period)
+{
+ if (!tc->getCpuPtr()->params->do_statistics_insts)
+ return;
- Tick when = curTick + delay * Clock::Int::ns;
- Tick repeat = period * Clock::Int::ns;
+ Tick when = curTick + delay * Clock::Int::ns;
+ Tick repeat = period * Clock::Int::ns;
- Stats::StatEvent(false, true, when, repeat);
- }
+ Stats::StatEvent(false, true, when, repeat);
+}
- void
- dumpstats(ThreadContext *tc, Tick delay, Tick period)
- {
- if (!tc->getCpuPtr()->params->do_statistics_insts)
- return;
+void
+dumpstats(ThreadContext *tc, Tick delay, Tick period)
+{
+ if (!tc->getCpuPtr()->params->do_statistics_insts)
+ return;
- Tick when = curTick + delay * Clock::Int::ns;
- Tick repeat = period * Clock::Int::ns;
+ Tick when = curTick + delay * Clock::Int::ns;
+ Tick repeat = period * Clock::Int::ns;
- Stats::StatEvent(true, false, when, repeat);
- }
+ Stats::StatEvent(true, false, when, repeat);
+}
- void
- addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr)
- {
- char symb[100];
- CopyStringOut(tc, symb, symbolAddr, 100);
- std::string symbol(symb);
+void
+addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr)
+{
+ char symb[100];
+ CopyStringOut(tc, symb, symbolAddr, 100);
+ std::string symbol(symb);
- DPRINTF(Loader, "Loaded symbol: %s @ %#llx\n", symbol, addr);
+ DPRINTF(Loader, "Loaded symbol: %s @ %#llx\n", symbol, addr);
- tc->getSystemPtr()->kernelSymtab->insert(addr,symbol);
- }
+ tc->getSystemPtr()->kernelSymtab->insert(addr,symbol);
+}
- void
- anBegin(ThreadContext *tc, uint64_t cur)
- {
- Annotate::annotations.add(tc->getSystemPtr(), 0, cur >> 32, cur &
- 0xFFFFFFFF, 0,0);
- }
+void
+anBegin(ThreadContext *tc, uint64_t cur)
+{
+ Annotate::annotations.add(tc->getSystemPtr(), 0, cur >> 32, cur &
+ 0xFFFFFFFF, 0,0);
+}
- void
- anWait(ThreadContext *tc, uint64_t cur, uint64_t wait)
- {
- Annotate::annotations.add(tc->getSystemPtr(), 0, cur >> 32, cur &
- 0xFFFFFFFF, wait >> 32, wait & 0xFFFFFFFF);
- }
+void
+anWait(ThreadContext *tc, uint64_t cur, uint64_t wait)
+{
+ Annotate::annotations.add(tc->getSystemPtr(), 0, cur >> 32, cur &
+ 0xFFFFFFFF, wait >> 32, wait & 0xFFFFFFFF);
+}
- void
- dumpresetstats(ThreadContext *tc, Tick delay, Tick period)
- {
- if (!tc->getCpuPtr()->params->do_statistics_insts)
- return;
+void
+dumpresetstats(ThreadContext *tc, Tick delay, Tick period)
+{
+ if (!tc->getCpuPtr()->params->do_statistics_insts)
+ return;
- Tick when = curTick + delay * Clock::Int::ns;
- Tick repeat = period * Clock::Int::ns;
+ Tick when = curTick + delay * Clock::Int::ns;
+ Tick repeat = period * Clock::Int::ns;
- Stats::StatEvent(true, true, when, repeat);
- }
+ Stats::StatEvent(true, true, when, repeat);
+}
+
+void
+m5checkpoint(ThreadContext *tc, Tick delay, Tick period)
+{
+ if (!tc->getCpuPtr()->params->do_checkpoint_insts)
+ return;
- void
- m5checkpoint(ThreadContext *tc, Tick delay, Tick period)
- {
- if (!tc->getCpuPtr()->params->do_checkpoint_insts)
- return;
+ Tick when = curTick + delay * Clock::Int::ns;
+ Tick repeat = period * Clock::Int::ns;
- Tick when = curTick + delay * Clock::Int::ns;
- Tick repeat = period * Clock::Int::ns;
+ schedExitSimLoop("checkpoint", when, repeat);
+}
- schedExitSimLoop("checkpoint", when, repeat);
+uint64_t
+readfile(ThreadContext *tc, Addr vaddr, uint64_t len, uint64_t offset)
+{
+ const string &file = tc->getSystemPtr()->params()->readfile;
+ if (file.empty()) {
+ return ULL(0);
}
- uint64_t
- readfile(ThreadContext *tc, Addr vaddr, uint64_t len, uint64_t offset)
- {
- const string &file = tc->getSystemPtr()->params()->readfile;
- if (file.empty()) {
- return ULL(0);
- }
-
- uint64_t result = 0;
-
- int fd = ::open(file.c_str(), O_RDONLY, 0);
- if (fd < 0)
- panic("could not open file %s\n", file);
-
- if (::lseek(fd, offset, SEEK_SET) < 0)
- panic("could not seek: %s", strerror(errno));
-
- char *buf = new char[len];
- char *p = buf;
- while (len > 0) {
- int bytes = ::read(fd, p, len);
- if (bytes <= 0)
- break;
-
- p += bytes;
- result += bytes;
- len -= bytes;
- }
-
- close(fd);
- CopyIn(tc, vaddr, buf, result);
- delete [] buf;
- return result;
- }
+ uint64_t result = 0;
- void debugbreak(ThreadContext *tc)
- {
- debug_break();
- }
+ int fd = ::open(file.c_str(), O_RDONLY, 0);
+ if (fd < 0)
+ panic("could not open file %s\n", file);
+
+ if (::lseek(fd, offset, SEEK_SET) < 0)
+ panic("could not seek: %s", strerror(errno));
- void switchcpu(ThreadContext *tc)
- {
- exitSimLoop("switchcpu");
+ char *buf = new char[len];
+ char *p = buf;
+ while (len > 0) {
+ int bytes = ::read(fd, p, len);
+ if (bytes <= 0)
+ break;
+
+ p += bytes;
+ result += bytes;
+ len -= bytes;
}
+
+ close(fd);
+ CopyIn(tc, vaddr, buf, result);
+ delete [] buf;
+ return result;
}
+
+void
+debugbreak(ThreadContext *tc)
+{
+ debug_break();
+}
+
+void
+switchcpu(ThreadContext *tc)
+{
+ exitSimLoop("switchcpu");
+}
+
+/* namespace PseudoInst */ }
diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh
index 93021abad..d94b358e5 100644
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -33,31 +33,33 @@ class ThreadContext;
//We need the "Tick" and "Addr" data types from here
#include "sim/host.hh"
-namespace PseudoInst
-{
- /**
- * @todo these externs are only here for a hack in fullCPU::takeOver...
- */
- extern bool doStatisticsInsts;
- extern bool doCheckpointInsts;
- extern bool doQuiesce;
+namespace PseudoInst {
- void arm(ThreadContext *tc);
- void quiesce(ThreadContext *tc);
- void quiesceNs(ThreadContext *tc, uint64_t ns);
- void quiesceCycles(ThreadContext *tc, uint64_t cycles);
- uint64_t quiesceTime(ThreadContext *tc);
- void m5exit(ThreadContext *tc, Tick delay);
- void m5exit_old(ThreadContext *tc);
- void loadsymbol(ThreadContext *xc);
- void resetstats(ThreadContext *tc, Tick delay, Tick period);
- void dumpstats(ThreadContext *tc, Tick delay, Tick period);
- void dumpresetstats(ThreadContext *tc, Tick delay, Tick period);
- void m5checkpoint(ThreadContext *tc, Tick delay, Tick period);
- uint64_t readfile(ThreadContext *tc, Addr vaddr, uint64_t len, uint64_t offset);
- void debugbreak(ThreadContext *tc);
- void switchcpu(ThreadContext *tc);
- void addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr);
- void anBegin(ThreadContext *tc, uint64_t cur);
- void anWait(ThreadContext *tc, uint64_t cur, uint64_t wait);
-}
+/**
+ * @todo these externs are only here for a hack in fullCPU::takeOver...
+ */
+extern bool doStatisticsInsts;
+extern bool doCheckpointInsts;
+extern bool doQuiesce;
+
+void arm(ThreadContext *tc);
+void quiesce(ThreadContext *tc);
+void quiesceNs(ThreadContext *tc, uint64_t ns);
+void quiesceCycles(ThreadContext *tc, uint64_t cycles);
+uint64_t quiesceTime(ThreadContext *tc);
+void m5exit(ThreadContext *tc, Tick delay);
+void m5exit_old(ThreadContext *tc);
+void loadsymbol(ThreadContext *xc);
+void resetstats(ThreadContext *tc, Tick delay, Tick period);
+void dumpstats(ThreadContext *tc, Tick delay, Tick period);
+void dumpresetstats(ThreadContext *tc, Tick delay, Tick period);
+void m5checkpoint(ThreadContext *tc, Tick delay, Tick period);
+uint64_t readfile(ThreadContext *tc, Addr vaddr, uint64_t len,
+ uint64_t offset);
+void debugbreak(ThreadContext *tc);
+void switchcpu(ThreadContext *tc);
+void addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr);
+void anBegin(ThreadContext *tc, uint64_t cur);
+void anWait(ThreadContext *tc, uint64_t cur, uint64_t wait);
+
+/* namespace PsuedoInst */ }