ARM: Implement WFE/WFI/SEV semantics.

[gem5.git] / src / sim / process.hh

diff --git a/src/sim/process.hh b/src/sim/process.hh
index 99666384786f94694335a4eefaa807f94de4f5f1..3b78cb0012e6a757c3013afa9a2cbf2a551323c9 100644 (file)
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -44,11 +44,13 @@
 #include <string>
 #include <vector>
 
+#include "arch/registers.hh"
 #include "base/statistics.hh"
-#include "sim/host.hh"
+#include "base/types.hh"
+#include "config/the_isa.hh"
 #include "sim/sim_object.hh"
+#include "sim/syscallreturn.hh"
 
-class GDBListener;
 class PageTable;
 class ProcessParams;
 class LiveProcessParams;
@@ -56,25 +58,17 @@ class SyscallDesc;
 class System;
 class ThreadContext;
 class TranslatingPort;
-namespace TheISA
-{
-    class RemoteGDB;
-}
 
 template<class IntType>
-struct M5_auxv_t
+struct AuxVector
 {
     IntType a_type;
-    union {
-        IntType a_val;
-        IntType a_ptr;
-        IntType a_fcn;
-    };
+    IntType a_val;
 
-    M5_auxv_t()
+    AuxVector()
     {}
 
-    M5_auxv_t(IntType type, IntType val);
+    AuxVector(IntType type, IntType val);
 };
 
 class Process : public SimObject
@@ -85,21 +79,9 @@ class Process : public SimObject
     /// running on.
     System *system;
 
-    // have we initialized a thread context from this process?  If
-    // yes, subsequent contexts are assumed to be for dynamically
-    // created threads and are not initialized.
-    bool initialContextLoaded;
-
-    bool checkpointRestored;
-
     // thread contexts associated with this process
     std::vector<int> contextIds;
 
-    // remote gdb objects
-    std::vector<TheISA::RemoteGDB *> remoteGDB;
-    std::vector<GDBListener *> gdbListen;
-    bool breakpoint();
-
     // number of CPUs (esxec contexts, really) assigned to this process.
     unsigned int numCpus() { return contextIds.size(); }
 
@@ -139,15 +121,14 @@ class Process : public SimObject
 
     std::string prog_fname;     // file name
 
-    Stats::Scalar<> num_syscalls;       // number of syscalls executed
+    Stats::Scalar num_syscalls;       // number of syscalls executed
 
 
   protected:
     // constructor
     Process(ProcessParams * params);
 
-    // post initialization startup
-    virtual void startup();
+    virtual void initState();
 
   protected:
     /// Memory object for initialization (image loading)
@@ -261,8 +242,6 @@ class LiveProcess : public Process
 
     LiveProcess(LiveProcessParams * params, ObjectFile *objFile);
 
-    virtual void argsInit(int intSize, int pageSize);
-
     // Id of the owner of the process
     uint64_t __uid;
     uint64_t __euid;
@@ -297,6 +276,10 @@ class LiveProcess : public Process
         M5_AT_CLKTCK = 17,
 
         M5_AT_SECURE = 23,
+        M5_BASE_PLATFORM = 24,
+        M5_AT_RANDOM = 25,
+
+        M5_AT_EXECFN = 31,
 
         M5_AT_VECTOR_SIZE = 44
     };
@@ -326,6 +309,13 @@ class LiveProcess : public Process
 
     virtual void syscall(int64_t callnum, ThreadContext *tc);
 
+    virtual TheISA::IntReg getSyscallArg(ThreadContext *tc, int &i) = 0;
+    virtual TheISA::IntReg getSyscallArg(ThreadContext *tc, int &i, int width);
+    virtual void setSyscallArg(ThreadContext *tc,
+            int i, TheISA::IntReg val) = 0;
+    virtual void setSyscallReturn(ThreadContext *tc,
+            SyscallReturn return_value) = 0;
+
     virtual SyscallDesc* getDesc(int callnum) = 0;
 
     // this function is used to create the LiveProcess object, since