X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fsim%2Fpseudo_inst.cc;h=7a91bfbd4d2e459f52c81f6934ed58450c157254;hb=edca5f7da6bad677dfc1ea69fff904554181cc17;hp=ae52cdd41284816108e7666464e129f0f311de44;hpb=3c95f5958fd1a90cf83d85e1b24fb700c07bae91;p=gem5.git

diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index ae52cdd41..7a91bfbd4 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -32,261 +32,298 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <fstream>
 #include <string>
 
-#include "sim/pseudo_inst.hh"
 #include "arch/vtophys.hh"
+#include "base/debug.hh"
+#include "config/full_system.hh"
+#include "config/the_isa.hh"
 #include "cpu/base.hh"
-#include "cpu/sampler/sampler.hh"
 #include "cpu/thread_context.hh"
 #include "cpu/quiesce_event.hh"
-#include "kern/kernel_stats.hh"
-#include "sim/param.hh"
+#include "params/BaseCPU.hh"
+#include "sim/pseudo_inst.hh"
 #include "sim/serialize.hh"
+#include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
 #include "sim/stat_control.hh"
 #include "sim/stats.hh"
 #include "sim/system.hh"
-#include "sim/debug.hh"
+
+#if FULL_SYSTEM
+#include "arch/kernel_stats.hh"
 #include "sim/vptr.hh"
+#endif
 
 using namespace std;
 
-extern Sampler *SampCPU;
-
 using namespace Stats;
 using namespace TheISA;
 
-namespace AlphaPseudo
+namespace PseudoInst {
+
+#if FULL_SYSTEM
+
+void
+arm(ThreadContext *tc)
 {
-    bool doStatisticsInsts;
-    bool doCheckpointInsts;
-    bool doQuiesce;
-
-    void
-    arm(ThreadContext *tc)
-    {
-        if (tc->getKernelStats())
-            tc->getKernelStats()->arm();
-    }
+    if (tc->getKernelStats())
+        tc->getKernelStats()->arm();
+}
 
-    void
-    quiesce(ThreadContext *tc)
-    {
-        if (!doQuiesce)
-            return;
+void
+quiesce(ThreadContext *tc)
+{
+    if (!tc->getCpuPtr()->params()->do_quiesce)
+        return;
 
-        tc->suspend();
-        if (tc->getKernelStats())
-            tc->getKernelStats()->quiesce();
-    }
+    DPRINTF(Quiesce, "%s: quiesce()\n", tc->getCpuPtr()->name());
 
-    void
-    quiesceNs(ThreadContext *tc, uint64_t ns)
-    {
-        if (!doQuiesce || ns == 0)
-            return;
+    tc->suspend();
+    if (tc->getKernelStats())
+        tc->getKernelStats()->quiesce();
+}
 
-        EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
+void
+quiesceNs(ThreadContext *tc, uint64_t ns)
+{
+    if (!tc->getCpuPtr()->params()->do_quiesce || ns == 0)
+        return;
 
-        if (quiesceEvent->scheduled())
-            quiesceEvent->reschedule(curTick + Clock::Int::ns * ns);
-        else
-            quiesceEvent->schedule(curTick + Clock::Int::ns * ns);
+    EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
 
-        tc->suspend();
-        if (tc->getKernelStats())
-            tc->getKernelStats()->quiesce();
-    }
+    Tick resume = curTick + SimClock::Int::ns * ns;
 
-    void
-    quiesceCycles(ThreadContext *tc, uint64_t cycles)
-    {
-        if (!doQuiesce || cycles == 0)
-            return;
+    mainEventQueue.reschedule(quiesceEvent, resume, true);
 
-        EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
+    DPRINTF(Quiesce, "%s: quiesceNs(%d) until %d\n",
+            tc->getCpuPtr()->name(), ns, resume);
 
-        if (quiesceEvent->scheduled())
-            quiesceEvent->reschedule(curTick +
-                                     tc->getCpuPtr()->cycles(cycles));
-        else
-            quiesceEvent->schedule(curTick +
-                                   tc->getCpuPtr()->cycles(cycles));
+    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;
 
-    uint64_t
-    quiesceTime(ThreadContext *tc)
-    {
-        return (tc->readLastActivate() - tc->readLastSuspend()) / Clock::Int::ns;
-    }
+    EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent();
 
-    void
-    ivlb(ThreadContext *tc)
-    {
-        if (tc->getKernelStats())
-            tc->getKernelStats()->ivlb();
-    }
+    Tick resume = curTick + tc->getCpuPtr()->ticks(cycles);
 
-    void
-    ivle(ThreadContext *tc)
-    {
-    }
+    mainEventQueue.reschedule(quiesceEvent, resume, true);
 
-    void
-    m5exit_old(ThreadContext *tc)
-    {
-        exitSimLoop(curTick, "m5_exit_old instruction encountered");
-    }
+    DPRINTF(Quiesce, "%s: quiesceCycles(%d) until %d\n",
+            tc->getCpuPtr()->name(), cycles, resume);
 
-    void
-    m5exit(ThreadContext *tc, Tick delay)
-    {
-        Tick when = curTick + delay * Clock::Int::ns;
-        exitSimLoop(when, "m5_exit instruction encountered");
-    }
+    tc->suspend();
+    if (tc->getKernelStats())
+        tc->getKernelStats()->quiesce();
+}
+
+uint64_t
+quiesceTime(ThreadContext *tc)
+{
+    return (tc->readLastActivate() - tc->readLastSuspend()) /
+        SimClock::Int::ns;
+}
+
+#endif
 
-    void
-    resetstats(ThreadContext *tc, Tick delay, Tick period)
-    {
-        if (!doStatisticsInsts)
-            return;
+uint64_t
+rpns(ThreadContext *tc)
+{
+    return curTick / SimClock::Int::ns;
+}
+
+void
+wakeCPU(ThreadContext *tc, uint64_t cpuid)
+{
+    System *sys = tc->getSystemPtr();
+    ThreadContext *other_tc = sys->threadContexts[cpuid];
+    if (other_tc->status() == ThreadContext::Suspended)
+        other_tc->activate();
+}
 
+void
+m5exit(ThreadContext *tc, Tick delay)
+{
+    Tick when = curTick + delay * SimClock::Int::ns;
+    Event *event = new SimLoopExitEvent("m5_exit instruction encountered", 0);
+    mainEventQueue.schedule(event, when);
+}
 
-        Tick when = curTick + delay * Clock::Int::ns;
-        Tick repeat = period * Clock::Int::ns;
+#if FULL_SYSTEM
 
-        using namespace Stats;
-        SetupEvent(Reset, when, repeat);
+void
+loadsymbol(ThreadContext *tc)
+{
+    const string &filename = tc->getCpuPtr()->system->params()->symbolfile;
+    if (filename.empty()) {
+        return;
     }
 
-    void
-    dumpstats(ThreadContext *tc, Tick delay, Tick period)
-    {
-        if (!doStatisticsInsts)
-            return;
+    std::string buffer;
+    ifstream file(filename.c_str());
 
+    if (!file)
+        fatal("file error: Can't open symbol table file %s\n", filename);
 
-        Tick when = curTick + delay * Clock::Int::ns;
-        Tick repeat = period * Clock::Int::ns;
+    while (!file.eof()) {
+        getline(file, buffer);
 
-        using namespace Stats;
-        SetupEvent(Dump, when, repeat);
-    }
+        if (buffer.empty())
+            continue;
 
-    void
-    addsymbol(ThreadContext *tc, Addr addr, Addr symbolAddr)
-    {
-        char symb[100];
-        CopyStringOut(tc, symb, symbolAddr, 100);
-        std::string symbol(symb);
+        string::size_type idx = buffer.find(' ');
+        if (idx == string::npos)
+            continue;
 
-        DPRINTF(Loader, "Loaded symbol: %s @ %#llx\n", symbol, addr);
+        string address = "0x" + buffer.substr(0, idx);
+        eat_white(address);
+        if (address.empty())
+            continue;
 
-        tc->getSystemPtr()->kernelSymtab->insert(addr,symbol);
-    }
+        // Skip over letter and space
+        string symbol = buffer.substr(idx + 3);
+        eat_white(symbol);
+        if (symbol.empty())
+            continue;
 
-    void
-    dumpresetstats(ThreadContext *tc, Tick delay, Tick period)
-    {
-        if (!doStatisticsInsts)
-            return;
+        Addr addr;
+        if (!to_number(address, addr))
+            continue;
 
+        if (!tc->getSystemPtr()->kernelSymtab->insert(addr, symbol))
+            continue;
 
-        Tick when = curTick + delay * Clock::Int::ns;
-        Tick repeat = period * Clock::Int::ns;
 
-        using namespace Stats;
-        SetupEvent(Dump|Reset, when, repeat);
+        DPRINTF(Loader, "Loaded symbol: %s @ %#llx\n", symbol, addr);
     }
+    file.close();
+}
 
-    void
-    m5checkpoint(ThreadContext *tc, Tick delay, Tick period)
-    {
-        if (!doCheckpointInsts)
-            return;
+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);
 
-        Tick when = curTick + delay * Clock::Int::ns;
-        Tick repeat = period * Clock::Int::ns;
+    tc->getSystemPtr()->kernelSymtab->insert(addr,symbol);
+    debugSymbolTable->insert(addr,symbol);
+}
 
-        Checkpoint::setup(when, repeat);
-    }
+#endif
 
-    uint64_t
-    readfile(ThreadContext *tc, Addr vaddr, uint64_t len, uint64_t offset)
-    {
-        const string &file = tc->getCpuPtr()->system->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;
-    }
 
-    class Context : public ParamContext
-    {
-      public:
-        Context(const string &section) : ParamContext(section) {}
-        void checkParams();
-    };
-
-    Context context("pseudo_inst");
-
-    Param<bool> __quiesce(&context, "quiesce",
-                          "enable quiesce instructions",
-                          true);
-    Param<bool> __statistics(&context, "statistics",
-                             "enable statistics pseudo instructions",
-                             true);
-    Param<bool> __checkpoint(&context, "checkpoint",
-                             "enable checkpoint pseudo instructions",
-                             true);
-
-    void
-    Context::checkParams()
-    {
-        doQuiesce = __quiesce;
-        doStatisticsInsts = __statistics;
-        doCheckpointInsts = __checkpoint;
-    }
+void
+resetstats(ThreadContext *tc, Tick delay, Tick period)
+{
+    if (!tc->getCpuPtr()->params()->do_statistics_insts)
+        return;
+
+
+    Tick when = curTick + delay * SimClock::Int::ns;
+    Tick repeat = period * SimClock::Int::ns;
+
+    Stats::StatEvent(false, true, when, repeat);
+}
+
+void
+dumpstats(ThreadContext *tc, Tick delay, Tick period)
+{
+    if (!tc->getCpuPtr()->params()->do_statistics_insts)
+        return;
+
+
+    Tick when = curTick + delay * SimClock::Int::ns;
+    Tick repeat = period * SimClock::Int::ns;
+
+    Stats::StatEvent(true, false, when, repeat);
+}
+
+void
+dumpresetstats(ThreadContext *tc, Tick delay, Tick period)
+{
+    if (!tc->getCpuPtr()->params()->do_statistics_insts)
+        return;
+
+
+    Tick when = curTick + delay * SimClock::Int::ns;
+    Tick repeat = period * SimClock::Int::ns;
+
+    Stats::StatEvent(true, true, when, repeat);
+}
 
-    void debugbreak(ThreadContext *tc)
-    {
-        debug_break();
+void
+m5checkpoint(ThreadContext *tc, Tick delay, Tick period)
+{
+    if (!tc->getCpuPtr()->params()->do_checkpoint_insts)
+        return;
+
+    Tick when = curTick + delay * SimClock::Int::ns;
+    Tick repeat = period * SimClock::Int::ns;
+
+    Event *event = new SimLoopExitEvent("checkpoint", 0, repeat);
+    mainEventQueue.schedule(event, when);
+}
+
+#if FULL_SYSTEM
+
+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);
     }
 
-    void switchcpu(ThreadContext *tc)
-    {
-        if (SampCPU)
-            SampCPU->switchCPUs();
+    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;
+}
+
+#endif
+
+void
+debugbreak(ThreadContext *tc)
+{
+    debug_break();
 }
+
+void
+switchcpu(ThreadContext *tc)
+{
+    exitSimLoop("switchcpu");
+}
+
+/* namespace PseudoInst */ }