LSQ Unit: After deleting part of a split request, set it to NULL so that it

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

diff --git a/src/sim/process.hh b/src/sim/process.hh
index db52e16978a48d2ea41f9b250ccb59ebc27a7025..e73f93fa55be7876eae986b8a9df5b9d9a0529b1 100644 (file)
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -44,13 +44,13 @@
 #include <string>
 #include <vector>
 
-#include "arch/types.hh"
+#include "arch/registers.hh"
 #include "base/statistics.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;
@@ -58,10 +58,6 @@ class SyscallDesc;
 class System;
 class ThreadContext;
 class TranslatingPort;
-namespace TheISA
-{
-    class RemoteGDB;
-}
 
 template<class IntType>
 struct AuxVector
@@ -83,21 +79,11 @@ 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(); }
 
@@ -259,8 +245,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;
@@ -295,6 +279,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
     };
@@ -323,7 +311,9 @@ class LiveProcess : public Process
     std::string getcwd() const { return cwd; }
 
     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) = 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,