summaryrefslogtreecommitdiff
path: root/src/arch/x86/isa/includes.isa
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2011-02-18 14:35:15 -0500
committerKorey Sewell <ksewell@umich.edu>2011-02-18 14:35:15 -0500
commit66bb732c04ccbe322586501f18423923672f335c (patch)
tree32aed408a40b2f908d9a697d8b61815de705730b /src/arch/x86/isa/includes.isa
parentab9c20cc78be49dbfc4bd8a4f479409094254e2a (diff)
parente3d8d43b176d3a1eb69a5e5d16469d42292e514a (diff)
downloadgem5-66bb732c04ccbe322586501f18423923672f335c.tar.xz
m5: merge inorder/release-notes/make_release changes
Diffstat (limited to 'src/arch/x86/isa/includes.isa')
-rw-r--r--src/arch/x86/isa/includes.isa2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 58b1fbc62..674e69e98 100644
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -53,6 +53,7 @@ output header {{
#include <sstream>
#include <iostream>
+#include "arch/generic/debugfaults.hh"
#include "arch/x86/emulenv.hh"
#include "arch/x86/insts/macroop.hh"
#include "arch/x86/insts/microfpop.hh"
@@ -113,6 +114,7 @@ output exec {{
#include "arch/x86/regs/misc.hh"
#include "arch/x86/tlb.hh"
#include "base/bigint.hh"
+#include "base/compiler.hh"
#include "base/condcodes.hh"
#include "cpu/base.hh"
#include "cpu/exetrace.hh"