summaryrefslogtreecommitdiff
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
parent867ff2b5f1e5643dc8bc95f48f0508d26445b507 (diff)
downloadgem5-74ca8a3cd023bce0e919d09b494ee1e6c672a2a2.tar.xz
ISA: Put parser generated files in a "generated" directory.
This is to avoid collision with non-generated files.
-rw-r--r--src/arch/SConscript3
-rw-r--r--src/arch/alpha/registers.hh2
-rw-r--r--src/arch/arm/insts/macromem.cc2
-rw-r--r--src/arch/arm/registers.hh2
-rw-r--r--src/arch/mips/registers.hh2
-rw-r--r--src/arch/power/registers.hh2
-rw-r--r--src/arch/sparc/registers.hh2
-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
10 files changed, 11 insertions, 10 deletions
diff --git a/src/arch/SConscript b/src/arch/SConscript
index 775aa1f41..d423fe9ea 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -29,6 +29,7 @@
# Authors: Steve Reinhardt
import sys
+import os
Import('*')
@@ -107,7 +108,7 @@ def isa_desc_emitter(target, source, env):
# Add in the CPU models.
source += [ Value(m) for m in cpu_models ]
- return target, source
+ return [os.path.join("generated", t) for t in target], source
ARCH_DIR = Dir('.')
diff --git a/src/arch/alpha/registers.hh b/src/arch/alpha/registers.hh
index 1c4bbdca3..2eefead16 100644
--- a/src/arch/alpha/registers.hh
+++ b/src/arch/alpha/registers.hh
@@ -31,8 +31,8 @@
#ifndef __ARCH_ALPHA_REGISTERS_HH__
#define __ARCH_ALPHA_REGISTERS_HH__
+#include "arch/alpha/generated/max_inst_regs.hh"
#include "arch/alpha/ipr.hh"
-#include "arch/alpha/max_inst_regs.hh"
#include "base/types.hh"
namespace AlphaISA {
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 {
diff --git a/src/arch/mips/registers.hh b/src/arch/mips/registers.hh
index d3cf1650d..0e5cbfc91 100644
--- a/src/arch/mips/registers.hh
+++ b/src/arch/mips/registers.hh
@@ -32,7 +32,7 @@
#ifndef __ARCH_MIPS_REGISTERS_HH__
#define __ARCH_MIPS_REGISTERS_HH__
-#include "arch/mips/max_inst_regs.hh"
+#include "arch/mips/generated/max_inst_regs.hh"
#include "base/misc.hh"
#include "base/types.hh"
diff --git a/src/arch/power/registers.hh b/src/arch/power/registers.hh
index 8b2aefc47..0d32201c2 100644
--- a/src/arch/power/registers.hh
+++ b/src/arch/power/registers.hh
@@ -31,7 +31,7 @@
#ifndef __ARCH_POWER_REGISTERS_HH__
#define __ARCH_POWER_REGISTERS_HH__
-#include "arch/power/max_inst_regs.hh"
+#include "arch/power/generated/max_inst_regs.hh"
#include "arch/power/miscregs.hh"
namespace PowerISA {
diff --git a/src/arch/sparc/registers.hh b/src/arch/sparc/registers.hh
index f4305dc1a..91904f42b 100644
--- a/src/arch/sparc/registers.hh
+++ b/src/arch/sparc/registers.hh
@@ -32,7 +32,7 @@
#ifndef __ARCH_SPARC_REGISTERS_HH__
#define __ARCH_SPARC_REGISTERS_HH__
-#include "arch/sparc/max_inst_regs.hh"
+#include "arch/sparc/generated/max_inst_regs.hh"
#include "arch/sparc/miscregs.hh"
#include "arch/sparc/sparc_traits.hh"
#include "base/types.hh"
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