From 4b61abe8da876ed3e56a1851384ec11ede65bd89 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Sun, 10 Apr 2011 21:02:28 -0400 Subject: [PATCH] ARM: Fix checkpoint restoration in ARM_SE. --- src/arch/arm/linux/process.cc | 4 ++-- src/arch/arm/linux/process.hh | 2 +- src/arch/arm/process.cc | 4 ++-- src/arch/arm/process.hh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc index 8cf113a60..6b449c2e7 100644 --- 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 7b9e5789e..f0a81c5fc 100644 --- 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 829911a7c..61349192f 100644 --- 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 6017f7649..8816b765d 100644 --- 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); -- 2.30.2