changeset 2eec3c58e50e in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=2eec3c58e50e
description:
Statetrace: Rename i386 to i686.
diffstat:
util/statetrace/SConstruct | 2 +-
util/statetrace/arch/i386/tracechild.cc | 104 --------------------------------
util/statetrace/arch/i386/tracechild.hh | 85 --------------------------
util/statetrace/arch/i686/tracechild.cc | 104 ++++++++++++++++++++++++++++++++
util/statetrace/arch/i686/tracechild.hh | 85 ++++++++++++++++++++++++++
util/statetrace/base/arch_check.h | 4 +-
6 files changed, 192 insertions(+), 192 deletions(-)
diffs (truncated from 422 to 300 lines):
diff -r 7739ad28c365 -r 2eec3c58e50e util/statetrace/SConstruct
--- a/util/statetrace/SConstruct Wed Mar 02 22:53:11 2011 -0800
+++ b/util/statetrace/SConstruct Wed Mar 02 22:53:11 2011 -0800
@@ -49,7 +49,7 @@
''')
-arches = 'amd64', 'arm', 'i386', 'sparc'
+arches = 'amd64', 'arm', 'i686', 'sparc'
import os
diff -r 7739ad28c365 -r 2eec3c58e50e util/statetrace/arch/i386/tracechild.cc
--- a/util/statetrace/arch/i386/tracechild.cc Wed Mar 02 22:53:11 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 <iostream>
-#include <errno.h>
-#include <sys/ptrace.h>
-#include <stdint.h>
-
-#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 -r 7739ad28c365 -r 2eec3c58e50e util/statetrace/arch/i386/tracechild.hh
--- a/util/statetrace/arch/i386/tracechild.hh Wed Mar 02 22:53:11 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 <sys/user.h>
-#include <sys/types.h>
-#include <sys/ptrace.h>
-#include <cassert>
-#include <string>
-
-#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 -r 7739ad28c365 -r 2eec3c58e50e util/statetrace/arch/i686/tracechild.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/util/statetrace/arch/i686/tracechild.cc Wed Mar 02 22:53:11 2011 -0800
@@ -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 <iostream>
+#include <errno.h>
+#include <sys/ptrace.h>
+#include <stdint.h>
+
+#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;
+}
+
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
