changeset ff4762285f99 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=ff4762285f99
description:
ISA: Put parser generated files in a "generated" directory.
This is to avoid collision with non-generated files.
diffstat:
src/arch/SConscript | 3 ++-
src/arch/alpha/registers.hh | 2 +-
src/arch/arm/insts/macromem.cc | 2 +-
src/arch/arm/registers.hh | 2 +-
src/arch/mips/registers.hh | 2 +-
src/arch/power/registers.hh | 2 +-
src/arch/sparc/registers.hh | 2 +-
src/arch/x86/faults.cc | 2 +-
src/arch/x86/insts/badmicroop.cc | 2 +-
src/arch/x86/registers.hh | 2 +-
10 files changed, 11 insertions(+), 10 deletions(-)
diffs (133 lines):
diff -r e7adb2ea547e -r ff4762285f99 src/arch/SConscript
--- a/src/arch/SConscript Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/SConscript Mon Apr 23 12:00:41 2012 -0700
@@ -29,6 +29,7 @@
# Authors: Steve Reinhardt
import sys
+import os
Import('*')
@@ -107,7 +108,7 @@
# 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 -r e7adb2ea547e -r ff4762285f99 src/arch/alpha/registers.hh
--- a/src/arch/alpha/registers.hh Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/alpha/registers.hh Mon Apr 23 12:00:41 2012 -0700
@@ -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 -r e7adb2ea547e -r ff4762285f99 src/arch/arm/insts/macromem.cc
--- a/src/arch/arm/insts/macromem.cc Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/arm/insts/macromem.cc Mon Apr 23 12:00:41 2012 -0700
@@ -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 -r e7adb2ea547e -r ff4762285f99 src/arch/arm/registers.hh
--- a/src/arch/arm/registers.hh Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/arm/registers.hh Mon Apr 23 12:00:41 2012 -0700
@@ -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 -r e7adb2ea547e -r ff4762285f99 src/arch/mips/registers.hh
--- a/src/arch/mips/registers.hh Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/mips/registers.hh Mon Apr 23 12:00:41 2012 -0700
@@ -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 -r e7adb2ea547e -r ff4762285f99 src/arch/power/registers.hh
--- a/src/arch/power/registers.hh Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/power/registers.hh Mon Apr 23 12:00:41 2012 -0700
@@ -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 -r e7adb2ea547e -r ff4762285f99 src/arch/sparc/registers.hh
--- a/src/arch/sparc/registers.hh Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/sparc/registers.hh Mon Apr 23 12:00:41 2012 -0700
@@ -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 -r e7adb2ea547e -r ff4762285f99 src/arch/x86/faults.cc
--- a/src/arch/x86/faults.cc Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/x86/faults.cc Mon Apr 23 12:00:41 2012 -0700
@@ -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 -r e7adb2ea547e -r ff4762285f99 src/arch/x86/insts/badmicroop.cc
--- a/src/arch/x86/insts/badmicroop.cc Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/x86/insts/badmicroop.cc Mon Apr 23 12:00:41 2012 -0700
@@ -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 -r e7adb2ea547e -r ff4762285f99 src/arch/x86/registers.hh
--- a/src/arch/x86/registers.hh Mon Apr 23 09:25:16 2012 -0700
+++ b/src/arch/x86/registers.hh Mon Apr 23 12:00:41 2012 -0700
@@ -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
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
