From: Gabe Black Date: Thu, 3 Mar 2011 06:53:11 +0000 (-0800) Subject: Statetrace: Rename i386 to i686. X-Git-Tag: stable_2012_02_02~489 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d2650792fa41155773b22771acbabdb4fbb164a;p=gem5.git Statetrace: Rename i386 to i686. --HG-- rename : util/statetrace/arch/i386/tracechild.cc => util/statetrace/arch/i686/tracechild.cc rename : util/statetrace/arch/i386/tracechild.hh => util/statetrace/arch/i686/tracechild.hh --- diff --git a/util/statetrace/SConstruct b/util/statetrace/SConstruct index 2e93162d8..5909772c6 100644 --- a/util/statetrace/SConstruct +++ b/util/statetrace/SConstruct @@ -49,7 +49,7 @@ the build// directories you specified on the command line. ''') -arches = 'amd64', 'arm', 'i386', 'sparc' +arches = 'amd64', 'arm', 'i686', 'sparc' import os diff --git a/util/statetrace/arch/i386/tracechild.cc b/util/statetrace/arch/i386/tracechild.cc deleted file mode 100644 index 67223666c..000000000 --- a/util/statetrace/arch/i386/tracechild.cc +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2006 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Gabe Black - */ - -#include -#include -#include -#include - -#include "arch/i386/tracechild.hh" - -using namespace std; - -int64_t -I386TraceChild::getRegs(user_regs_struct & myregs, int num) -{ - assert(num < numregs && num >= 0); - switch (num) { - //GPRs - case EAX: return myregs.eax; - case EBX: return myregs.ebx; - case ECX: return myregs.ecx; - case EDX: return myregs.edx; - //Index registers - case ESI: return myregs.esi; - case EDI: return myregs.edi; - //Base pointer and stack pointer - case EBP: return myregs.ebp; - case ESP: return myregs.esp; - //Segmentation registers - case CS: return myregs.xcs; - case DS: return myregs.xds; - case ES: return myregs.xes; - case FS: return myregs.xfs; - case GS: return myregs.xgs; - case SS: return myregs.xss; - //PC - case EIP: return myregs.eip; - default: - assert(0); - return 0; - } -} - -bool -I386TraceChild::update(int pid) -{ - oldregs = regs; - if (ptrace(PTRACE_GETREGS, pid, 0, ®s) != 0) - return false; - for (unsigned int x = 0; x < numregs; x++) { - regDiffSinceUpdate[x] = (getRegVal(x) != getOldRegVal(x)); - } -} - -I386TraceChild::I386TraceChild() -{ - for (unsigned int x = 0; x < numregs; x++) - regDiffSinceUpdate[x] = false; -} - -int64_t -I386TraceChild::getRegVal(int num) -{ - return getRegs(regs, num); -} - -int64_t -I386TraceChild::getOldRegVal(int num) -{ - return getRegs(oldregs, num); -} - -TraceChild * -genTraceChild() -{ - return new I386TraceChild; -} diff --git a/util/statetrace/arch/i386/tracechild.hh b/util/statetrace/arch/i386/tracechild.hh deleted file mode 100644 index 30c75afec..000000000 --- a/util/statetrace/arch/i386/tracechild.hh +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2006 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Gabe Black - */ - -#ifndef REGSTATE_I386_HH -#define REGSTATE_I386_HH - -#include -#include -#include -#include -#include - -#include "base/tracechild.hh" - -class I386TraceChild : public TraceChild -{ - public: - enum RegNum - { - //GPRs - EAX, EBX, ECX, EDX, - //Index registers - ESI, EDI, - //Base pointer and stack pointer - EBP, ESP, - //Segmentation registers - CS, DS, ES, FS, GS, SS, - //PC - EIP, - numregs - }; - private: - int64_t getRegs(user_regs_struct & myregs, int num); - user_regs_struct regs; - user_regs_struct oldregs; - bool regDiffSinceUpdate[numregs]; - - protected: - bool update(int pid); - - public: - - I386TraceChild(); - - int64_t getRegVal(int num); - int64_t getOldRegVal(int num); - uint64_t getPC() {return getRegVal(EIP);} - uint64_t getSP() {return getRegVal(ESP);} - std::ostream & - outputStartState(std::ostream & output) - { - output << "Printing i386 initial state not yet implemented" - << std::endl; - return output; - } -}; - -#endif diff --git a/util/statetrace/arch/i686/tracechild.cc b/util/statetrace/arch/i686/tracechild.cc new file mode 100644 index 000000000..0ac977b4a --- /dev/null +++ b/util/statetrace/arch/i686/tracechild.cc @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2006 The Regents of The University of Michigan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Authors: Gabe Black + */ + +#include +#include +#include +#include + +#include "arch/i686/tracechild.hh" + +using namespace std; + +int64_t +I686TraceChild::getRegs(user_regs_struct & myregs, int num) +{ + assert(num < numregs && num >= 0); + switch (num) { + //GPRs + case EAX: return myregs.eax; + case EBX: return myregs.ebx; + case ECX: return myregs.ecx; + case EDX: return myregs.edx; + //Index registers + case ESI: return myregs.esi; + case EDI: return myregs.edi; + //Base pointer and stack pointer + case EBP: return myregs.ebp; + case ESP: return myregs.esp; + //Segmentation registers + case CS: return myregs.xcs; + case DS: return myregs.xds; + case ES: return myregs.xes; + case FS: return myregs.xfs; + case GS: return myregs.xgs; + case SS: return myregs.xss; + //PC + case EIP: return myregs.eip; + default: + assert(0); + return 0; + } +} + +bool +I686TraceChild::update(int pid) +{ + oldregs = regs; + if (ptrace(PTRACE_GETREGS, pid, 0, ®s) != 0) + return false; + for (unsigned int x = 0; x < numregs; x++) { + regDiffSinceUpdate[x] = (getRegVal(x) != getOldRegVal(x)); + } +} + +I686TraceChild::I686TraceChild() +{ + for (unsigned int x = 0; x < numregs; x++) + regDiffSinceUpdate[x] = false; +} + +int64_t +I686TraceChild::getRegVal(int num) +{ + return getRegs(regs, num); +} + +int64_t +I686TraceChild::getOldRegVal(int num) +{ + return getRegs(oldregs, num); +} + +TraceChild * +genTraceChild() +{ + return new I686TraceChild; +} diff --git a/util/statetrace/arch/i686/tracechild.hh b/util/statetrace/arch/i686/tracechild.hh new file mode 100644 index 000000000..c21955506 --- /dev/null +++ b/util/statetrace/arch/i686/tracechild.hh @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2006 The Regents of The University of Michigan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Authors: Gabe Black + */ + +#ifndef REGSTATE_I686_HH +#define REGSTATE_I686_HH + +#include +#include +#include +#include +#include + +#include "base/tracechild.hh" + +class I686TraceChild : public TraceChild +{ + public: + enum RegNum + { + //GPRs + EAX, EBX, ECX, EDX, + //Index registers + ESI, EDI, + //Base pointer and stack pointer + EBP, ESP, + //Segmentation registers + CS, DS, ES, FS, GS, SS, + //PC + EIP, + numregs + }; + private: + int64_t getRegs(user_regs_struct & myregs, int num); + user_regs_struct regs; + user_regs_struct oldregs; + bool regDiffSinceUpdate[numregs]; + + protected: + bool update(int pid); + + public: + + I686TraceChild(); + + int64_t getRegVal(int num); + int64_t getOldRegVal(int num); + uint64_t getPC() {return getRegVal(EIP);} + uint64_t getSP() {return getRegVal(ESP);} + std::ostream & + outputStartState(std::ostream & output) + { + output << "Printing i686 initial state not yet implemented" + << std::endl; + return output; + } +}; + +#endif diff --git a/util/statetrace/base/arch_check.h b/util/statetrace/base/arch_check.h index ab350e5c7..a5bdf477d 100644 --- a/util/statetrace/base/arch_check.h +++ b/util/statetrace/base/arch_check.h @@ -44,10 +44,10 @@ #if !defined __hppa__ #error "Hppa toolchain required." #endif -#elif defined __STATETRACE_I386__ +#elif defined __STATETRACE_I686__ #if !(defined __i386__ || defined __i486__ || \ defined __i586__ || defined __i686__) - #error "I386 toolchain required." + #error "I686 toolchain required." #endif #elif defined __STATETRACE_IA64__ #if !defined __ia64__