summaryrefslogtreecommitdiff
path: root/src/arch/arm
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/arm
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/arm')
-rw-r--r--src/arch/arm/insts/macromem.cc2
-rw-r--r--src/arch/arm/registers.hh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index 48e561c95..e1b754204 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -43,7 +43,7 @@
#include <sstream>
#include "arch/arm/insts/macromem.hh"
-#include "arch/arm/decoder.hh"
+#include "arch/arm/generated/decoder.hh"
using namespace std;
using namespace ArmISAInst;
diff --git a/src/arch/arm/registers.hh b/src/arch/arm/registers.hh
index 14ec03471..1a688af56 100644
--- a/src/arch/arm/registers.hh
+++ b/src/arch/arm/registers.hh
@@ -43,8 +43,8 @@
#ifndef __ARCH_ARM_REGISTERS_HH__
#define __ARCH_ARM_REGISTERS_HH__
+#include "arch/arm/generated/max_inst_regs.hh"
#include "arch/arm/intregs.hh"
-#include "arch/arm/max_inst_regs.hh"
#include "arch/arm/miscregs.hh"
namespace ArmISA {