ARM: Fix checkpoint restoration in ARM_SE.

diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc
index 8cf113a60137fa9da78ed8b1da560fceba8b4c7b..6b449c2e75665a3555e8a88f19b71a2056990391 100644 (file)
--- a/src/arch/arm/linux/process.cc
+++ b/src/arch/arm/linux/process.cc
@@ -502,9 +502,9 @@ ArmLinuxProcess::getDesc(int callnum)
 }
 
 void
-ArmLinuxProcess::startup()
+ArmLinuxProcess::initState()
 {
-    ArmLiveProcess::startup();
+    ArmLiveProcess::initState();
     pTable->allocate(commPage, PageBytes);
     ThreadContext *tc = system->getThreadContext(contextIds[0]);
 

diff --git a/src/arch/arm/linux/process.hh b/src/arch/arm/linux/process.hh
index 7b9e5789ec9a5e4e313ef67cd527826bdccb2850..f0a81c5fcabe79cff01f833f551dc72c78103db4 100644 (file)
--- a/src/arch/arm/linux/process.hh
+++ b/src/arch/arm/linux/process.hh
@@ -43,7 +43,7 @@ class ArmLinuxProcess : public ArmLiveProcess
 
     virtual SyscallDesc* getDesc(int callnum);
 
-    void startup();
+    void initState();
 
     ArmISA::IntReg getSyscallArg(ThreadContext *tc, int &i);
     void setSyscallArg(ThreadContext *tc, int i, ArmISA::IntReg val);

diff --git a/src/arch/arm/process.cc b/src/arch/arm/process.cc
index 829911a7c9d4dd3a782554366e002519a97d91ab..61349192f62a248c38934c1c8a4097e7ce06bcfe 100644 (file)
--- a/src/arch/arm/process.cc
+++ b/src/arch/arm/process.cc
@@ -75,9 +75,9 @@ ArmLiveProcess::ArmLiveProcess(LiveProcessParams *params, ObjectFile *objFile,
 }
 
 void
-ArmLiveProcess::startup()
+ArmLiveProcess::initState()
 {
-    LiveProcess::startup();
+    LiveProcess::initState();
     argsInit(MachineBytes, VMPageSize);
     for (int i = 0; i < contextIds.size(); i++) {
         ThreadContext * tc = system->getThreadContext(contextIds[i]);

diff --git a/src/arch/arm/process.hh b/src/arch/arm/process.hh
index 6017f764903b3deae1134762018b1b18d0160c2d..8816b765d86aae5219c32632dcfc59a0795aa16f 100644 (file)
--- a/src/arch/arm/process.hh
+++ b/src/arch/arm/process.hh
@@ -47,7 +47,7 @@ class ArmLiveProcess : public LiveProcess
     ArmLiveProcess(LiveProcessParams * params, ObjectFile *objFile,
                    ObjectFile::Arch _arch);
 
-    void startup();
+    void initState();
 
   public:
     void argsInit(int intSize, int pageSize);