Merge m5.eecs.umich.edu:/bk/newmem

into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 3eb97976caf57e43119a998c31128ca6f163c05b

1 files changed, 7 insertions, 3 deletions

diff --git a/sim/process.hh b/sim/process.hh
index b5b9d18b3..807bf330f 100644
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -50,6 +50,10 @@ class PageTable;
 class TranslatingPort;
 class System;
 
+void
+copyStringArray(std::vector<std::string> &strings, Addr array_ptr,
+        Addr data_ptr, TranslatingPort* memPort);
+
 class Process : public SimObject
 {
   public:
@@ -155,7 +159,7 @@ class Process : public SimObject
     // look up simulator fd for given target fd
     int sim_fd(int tgt_fd);
 
-    virtual void syscall(ExecContext *xc) = 0;
+    virtual void syscall(int64_t callnum, ExecContext *xc) = 0;
 };
 
 //
@@ -174,10 +178,10 @@ class LiveProcess : public Process
                 std::vector<std::string> &argv,
                 std::vector<std::string> &envp);
 
-    void argsInit(int intSize, int pageSize);
+    virtual void argsInit(int intSize, int pageSize);
 
   public:
-    virtual void syscall(ExecContext *xc);
+    virtual void syscall(int64_t callnum, ExecContext *xc);
 
     virtual SyscallDesc* getDesc(int callnum) = 0;
 };