summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2012-04-23 12:00:41 -0700
committerGabe Black <gblack@eecs.umich.edu>2012-04-23 12:00:41 -0700
commit74ca8a3cd023bce0e919d09b494ee1e6c672a2a2 (patch)
tree517dfd4b2ed042a99c0073ea3a05795eeaf9fdb8 /src/arch/x86
parent867ff2b5f1e5643dc8bc95f48f0508d26445b507 (diff)
downloadgem5-74ca8a3cd023bce0e919d09b494ee1e6c672a2a2.tar.xz
ISA: Put parser generated files in a "generated" directory.
This is to avoid collision with non-generated files.
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/faults.cc2
-rw-r--r--src/arch/x86/insts/badmicroop.cc2
-rw-r--r--src/arch/x86/registers.hh2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index e95d8e7dc..92f3dc257 100644
--- a/src/arch/x86/faults.cc
+++ b/src/arch/x86/faults.cc
@@ -40,7 +40,7 @@
* Authors: Gabe Black
*/
-#include "arch/x86/decoder.hh"
+#include "arch/x86/generated/decoder.hh"
#include "arch/x86/faults.hh"
#include "arch/x86/isa_traits.hh"
#include "base/trace.hh"
diff --git a/src/arch/x86/insts/badmicroop.cc b/src/arch/x86/insts/badmicroop.cc
index d075c8c47..96125f175 100644
--- a/src/arch/x86/insts/badmicroop.cc
+++ b/src/arch/x86/insts/badmicroop.cc
@@ -37,8 +37,8 @@
* Authors: Gabe Black
*/
+#include "arch/x86/generated/decoder.hh"
#include "arch/x86/insts/badmicroop.hh"
-#include "arch/x86/decoder.hh"
#include "arch/x86/isa_traits.hh"
namespace X86ISA
diff --git a/src/arch/x86/registers.hh b/src/arch/x86/registers.hh
index c3bda5a19..66f5dab80 100644
--- a/src/arch/x86/registers.hh
+++ b/src/arch/x86/registers.hh
@@ -40,9 +40,9 @@
#ifndef __ARCH_X86_REGISTERS_HH__
#define __ARCH_X86_REGISTERS_HH__
+#include "arch/x86/generated/max_inst_regs.hh"
#include "arch/x86/regs/int.hh"
#include "arch/x86/regs/misc.hh"
-#include "arch/x86/max_inst_regs.hh"
#include "arch/x86/x86_traits.hh"
namespace X86ISA