style: fix indentation and formatting of the pseudo insts.

This commit is contained in:
Nathan Binkert 2008-07-11 08:52:50 -07:00
parent f90b08a5cc
commit 88766f7c71
2 changed files with 268 additions and 263 deletions

View file

@ -55,18 +55,18 @@ 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();
}
}
void
quiesce(ThreadContext *tc)
{
void
quiesce(ThreadContext *tc)
{
if (!tc->getCpuPtr()->params->do_quiesce)
return;
@ -75,11 +75,11 @@ namespace PseudoInst
tc->suspend();
if (tc->getKernelStats())
tc->getKernelStats()->quiesce();
}
}
void
quiesceNs(ThreadContext *tc, uint64_t ns)
{
void
quiesceNs(ThreadContext *tc, uint64_t ns)
{
if (!tc->getCpuPtr()->params->do_quiesce || ns == 0)
return;
@ -95,11 +95,11 @@ namespace PseudoInst
tc->suspend();
if (tc->getKernelStats())
tc->getKernelStats()->quiesce();
}
}
void
quiesceCycles(ThreadContext *tc, uint64_t cycles)
{
void
quiesceCycles(ThreadContext *tc, uint64_t cycles)
{
if (!tc->getCpuPtr()->params->do_quiesce || cycles == 0)
return;
@ -115,30 +115,30 @@ namespace PseudoInst
tc->suspend();
if (tc->getKernelStats())
tc->getKernelStats()->quiesce();
}
}
uint64_t
quiesceTime(ThreadContext *tc)
{
uint64_t
quiesceTime(ThreadContext *tc)
{
return (tc->readLastActivate() - tc->readLastSuspend()) / Clock::Int::ns;
}
}
void
m5exit_old(ThreadContext *tc)
{
void
m5exit_old(ThreadContext *tc)
{
exitSimLoop("m5_exit_old instruction encountered");
}
}
void
m5exit(ThreadContext *tc, Tick delay)
{
void
m5exit(ThreadContext *tc, Tick delay)
{
Tick when = curTick + delay * Clock::Int::ns;
schedExitSimLoop("m5_exit instruction encountered", when);
}
}
void
loadsymbol(ThreadContext *tc)
{
void
loadsymbol(ThreadContext *tc)
{
const string &filename = tc->getCpuPtr()->system->params()->symbolfile;
if (filename.empty()) {
return;
@ -182,11 +182,11 @@ namespace PseudoInst
DPRINTF(Loader, "Loaded symbol: %s @ %#llx\n", symbol, addr);
}
file.close();
}
}
void
resetstats(ThreadContext *tc, Tick delay, Tick period)
{
void
resetstats(ThreadContext *tc, Tick delay, Tick period)
{
if (!tc->getCpuPtr()->params->do_statistics_insts)
return;
@ -195,11 +195,11 @@ namespace PseudoInst
Tick repeat = period * Clock::Int::ns;
Stats::StatEvent(false, true, when, repeat);
}
}
void
dumpstats(ThreadContext *tc, Tick delay, Tick period)
{
void
dumpstats(ThreadContext *tc, Tick delay, Tick period)
{
if (!tc->getCpuPtr()->params->do_statistics_insts)
return;
@ -208,11 +208,11 @@ namespace PseudoInst
Tick repeat = period * Clock::Int::ns;
Stats::StatEvent(true, false, when, repeat);
}
}
void
addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr)
{
void
addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr)
{
char symb[100];
CopyStringOut(tc, symb, symbolAddr, 100);
std::string symbol(symb);
@ -220,26 +220,26 @@ namespace PseudoInst
DPRINTF(Loader, "Loaded symbol: %s @ %#llx\n", symbol, addr);
tc->getSystemPtr()->kernelSymtab->insert(addr,symbol);
}
}
void
anBegin(ThreadContext *tc, uint64_t cur)
{
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)
{
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)
{
void
dumpresetstats(ThreadContext *tc, Tick delay, Tick period)
{
if (!tc->getCpuPtr()->params->do_statistics_insts)
return;
@ -248,11 +248,11 @@ namespace PseudoInst
Tick repeat = period * Clock::Int::ns;
Stats::StatEvent(true, true, when, repeat);
}
}
void
m5checkpoint(ThreadContext *tc, Tick delay, Tick period)
{
void
m5checkpoint(ThreadContext *tc, Tick delay, Tick period)
{
if (!tc->getCpuPtr()->params->do_checkpoint_insts)
return;
@ -260,11 +260,11 @@ namespace PseudoInst
Tick repeat = period * Clock::Int::ns;
schedExitSimLoop("checkpoint", when, repeat);
}
}
uint64_t
readfile(ThreadContext *tc, Addr vaddr, uint64_t len, uint64_t offset)
{
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);
@ -295,15 +295,18 @@ namespace PseudoInst
CopyIn(tc, vaddr, buf, result);
delete [] buf;
return result;
}
void debugbreak(ThreadContext *tc)
{
debug_break();
}
void switchcpu(ThreadContext *tc)
{
exitSimLoop("switchcpu");
}
}
void
debugbreak(ThreadContext *tc)
{
debug_break();
}
void
switchcpu(ThreadContext *tc)
{
exitSimLoop("switchcpu");
}
/* namespace PseudoInst */ }

View file

@ -33,31 +33,33 @@ class ThreadContext;
//We need the "Tick" and "Addr" data types from here
#include "sim/host.hh"
namespace PseudoInst
{
/**
namespace PseudoInst {
/**
* @todo these externs are only here for a hack in fullCPU::takeOver...
*/
extern bool doStatisticsInsts;
extern bool doCheckpointInsts;
extern bool doQuiesce;
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);
}
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 */ }