summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-03-02 22:53:11 -0800
committerGabe Black <gblack@eecs.umich.edu>2011-03-02 22:53:11 -0800
commit9d2650792fa41155773b22771acbabdb4fbb164a (patch)
treee5beba639942c7c2bd32fe7e9166b543a796a662
parent3bcd77ddef91c204b6fceceaf6bd5c9362bf1f98 (diff)
downloadgem5-9d2650792fa41155773b22771acbabdb4fbb164a.tar.xz
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
-rw-r--r--util/statetrace/SConstruct2
-rw-r--r--util/statetrace/arch/i686/tracechild.cc (renamed from util/statetrace/arch/i386/tracechild.cc)14
-rw-r--r--util/statetrace/arch/i686/tracechild.hh (renamed from util/statetrace/arch/i386/tracechild.hh)10
-rw-r--r--util/statetrace/base/arch_check.h4
4 files changed, 15 insertions, 15 deletions
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/<arch>/ 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/i686/tracechild.cc
index 67223666c..0ac977b4a 100644
--- a/util/statetrace/arch/i386/tracechild.cc
+++ b/util/statetrace/arch/i686/tracechild.cc
@@ -33,12 +33,12 @@
#include <sys/ptrace.h>
#include <stdint.h>
-#include "arch/i386/tracechild.hh"
+#include "arch/i686/tracechild.hh"
using namespace std;
int64_t
-I386TraceChild::getRegs(user_regs_struct & myregs, int num)
+I686TraceChild::getRegs(user_regs_struct & myregs, int num)
{
assert(num < numregs && num >= 0);
switch (num) {
@@ -69,7 +69,7 @@ I386TraceChild::getRegs(user_regs_struct & myregs, int num)
}
bool
-I386TraceChild::update(int pid)
+I686TraceChild::update(int pid)
{
oldregs = regs;
if (ptrace(PTRACE_GETREGS, pid, 0, &regs) != 0)
@@ -79,20 +79,20 @@ I386TraceChild::update(int pid)
}
}
-I386TraceChild::I386TraceChild()
+I686TraceChild::I686TraceChild()
{
for (unsigned int x = 0; x < numregs; x++)
regDiffSinceUpdate[x] = false;
}
int64_t
-I386TraceChild::getRegVal(int num)
+I686TraceChild::getRegVal(int num)
{
return getRegs(regs, num);
}
int64_t
-I386TraceChild::getOldRegVal(int num)
+I686TraceChild::getOldRegVal(int num)
{
return getRegs(oldregs, num);
}
@@ -100,5 +100,5 @@ I386TraceChild::getOldRegVal(int num)
TraceChild *
genTraceChild()
{
- return new I386TraceChild;
+ return new I686TraceChild;
}
diff --git a/util/statetrace/arch/i386/tracechild.hh b/util/statetrace/arch/i686/tracechild.hh
index 30c75afec..c21955506 100644
--- a/util/statetrace/arch/i386/tracechild.hh
+++ b/util/statetrace/arch/i686/tracechild.hh
@@ -28,8 +28,8 @@
* Authors: Gabe Black
*/
-#ifndef REGSTATE_I386_HH
-#define REGSTATE_I386_HH
+#ifndef REGSTATE_I686_HH
+#define REGSTATE_I686_HH
#include <sys/user.h>
#include <sys/types.h>
@@ -39,7 +39,7 @@
#include "base/tracechild.hh"
-class I386TraceChild : public TraceChild
+class I686TraceChild : public TraceChild
{
public:
enum RegNum
@@ -67,7 +67,7 @@ class I386TraceChild : public TraceChild
public:
- I386TraceChild();
+ I686TraceChild();
int64_t getRegVal(int num);
int64_t getOldRegVal(int num);
@@ -76,7 +76,7 @@ class I386TraceChild : public TraceChild
std::ostream &
outputStartState(std::ostream & output)
{
- output << "Printing i386 initial state not yet implemented"
+ output << "Printing i686 initial state not yet implemented"
<< std::endl;
return output;
}
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__