ISA: Put parser generated files in a "generated" directory.

This is to avoid collision with non-generated files.

diff --git a/src/arch/SConscript b/src/arch/SConscript
index 775aa1f41ca9a472ea5d8be886aeddf2d1d266ef..d423fe9ead60e3c62224afe48658dfea27a7cfe8 100644 (file)
--- 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 1c4bbdca3cc6391d59afdb529bd4c02e2b1537c2..2eefead162966f16df47611701dd352703fbaef1 100644 (file)
--- 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 48e561c953e9c096162bd506a298e40f48f78232..e1b7542044af9386c9cfe1ff514f7431d1258d95 100644 (file)
--- 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 14ec0347184a9c41b2fbceb9b231682447161323..1a688af5629b9630fec18110b9bf5f5214990738 100644 (file)
--- 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 d3cf1650d33ea2426870ad559adbb744d0e95944..0e5cbfc91834c6aa49f60db0d510814660451465 100644 (file)
--- 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 8b2aefc47114b372c63c3c0ab527d79c2b41f6cc..0d32201c2d00d0e975bda85bd9edc746f46ddba6 100644 (file)
--- 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 f4305dc1a98a921cd275b92e3469bd4e3d2d03d3..91904f42b8e064e5c315e214bdaeca7daf24eaac 100644 (file)
--- 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 e95d8e7dc9033b8fd21cca24010947e98450258c..92f3dc2573f5188cbedb7f1186cec0e4ece08d62 100644 (file)
--- 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 d075c8c47363b3fbbd4c8299fa2da82dbf9fe9e4..96125f175591faa2dc6e596fb608916b53b13527 100644 (file)
--- 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 c3bda5a19523959b927dab3795bb12b605aabb9e..66f5dab806aea7dc1ff918e3c25160e8cc7f0926 100644 (file)
--- 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