summaryrefslogtreecommitdiff
path: root/util
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
commit16d997840aab1fbc3dc949fbb6b9539c7dc2f466 (patch)
treeaf6afb21cb025ffae2422bb21a7380fd4099c14f /util
parentd7a47af12d64a533d583583f4473675262c35c67 (diff)
downloadgem5-16d997840aab1fbc3dc949fbb6b9539c7dc2f466.tar.xz
Statetrace: Use sys/user.h instead of linux/user.h.
Diffstat (limited to 'util')
-rw-r--r--util/statetrace/arch/i386/tracechild.cc12
-rw-r--r--util/statetrace/arch/i386/tracechild.hh2
2 files changed, 7 insertions, 7 deletions
diff --git a/util/statetrace/arch/i386/tracechild.cc b/util/statetrace/arch/i386/tracechild.cc
index 0d868767c..67223666c 100644
--- a/util/statetrace/arch/i386/tracechild.cc
+++ b/util/statetrace/arch/i386/tracechild.cc
@@ -54,12 +54,12 @@ I386TraceChild::getRegs(user_regs_struct & myregs, int num)
case EBP: return myregs.ebp;
case ESP: return myregs.esp;
//Segmentation registers
- case CS: return myregs.cs;
- case DS: return myregs.ds;
- case ES: return myregs.es;
- case FS: return myregs.fs;
- case GS: return myregs.gs;
- case SS: return myregs.ss;
+ 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:
diff --git a/util/statetrace/arch/i386/tracechild.hh b/util/statetrace/arch/i386/tracechild.hh
index 3af621ed6..30c75afec 100644
--- a/util/statetrace/arch/i386/tracechild.hh
+++ b/util/statetrace/arch/i386/tracechild.hh
@@ -31,7 +31,7 @@
#ifndef REGSTATE_I386_HH
#define REGSTATE_I386_HH
-#include <linux/user.h>
+#include <sys/user.h>
#include <sys/types.h>
#include <sys/ptrace.h>
#include <cassert>