Changed targetarch to just arch.

SConscript:
    Changed all of the "targetarch" files to be "arch" files
arch/SConscript:
    Added all of the remaining targetarch files to isa_switch_hdrs

--HG--
extra : convert_revision : a37d18349e27cf92dce12814f21944daa7fe9480

diff --git a/SConscript b/SConscript
index 966cb6d3e86193d0a4a4e437a8ed9b5e05e86cbf..540876699dc65f14dcb09006b6cf6a802e66d215 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -305,23 +305,23 @@ syscall_emulation_sources = Split('''
 # time.  These will have to go away if we want to build a binary that
 # supports multiple ISAs.
 
-targetarch_files = Split('''
-        alpha_linux_process.hh
-        alpha_memory.hh
-        alpha_tru64_process.hh
-        aout_machdep.h
-        arguments.hh
-        ecoff_machdep.h
-        ev5.hh
-        faults.hh
-        stacktrace.hh
-        vtophys.hh
-        ''')
+#targetarch_files = Split('''
+#        alpha_linux_process.hh
+#        alpha_memory.hh
+#        alpha_tru64_process.hh
+#        aout_machdep.h
+#        arguments.hh
+#        ecoff_machdep.h
+#        ev5.hh
+#        faults.hh
+#        stacktrace.hh
+#        vtophys.hh
+#        ''')
 
 # Set up bridging headers to the architecture specific versions
-for f in targetarch_files:
-    env.Command('targetarch/' + f, 'arch/%s/%s' % (env['TARGET_ISA'], f),
-                '''echo '#include "arch/%s/%s"' > $TARGET''' % (env['TARGET_ISA'], f))
+#for f in targetarch_files:
+#    env.Command('targetarch/' + f, 'arch/%s/%s' % (env['TARGET_ISA'], f),
+#                '''echo '#include "arch/%s/%s"' > $TARGET''' % (env['TARGET_ISA'], f))
 
 # Add a flag defining what THE_ISA should be for all compilation
 env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())])

diff --git a/arch/SConscript b/arch/SConscript
index d237b0b1f680cede10d60cb0721b234c03426314..2036b6a5607d0c4d7d270036a16ef1b2d64628f3 100644 (file)
--- a/arch/SConscript
+++ b/arch/SConscript
@@ -46,6 +46,16 @@ sources = []
 # List of headers to generate
 isa_switch_hdrs = Split('''
        isa_traits.hh
+       alpha_linux_process.hh
+       alpha_tru64_process.hh
+       alpha_memory.hh
+       aout_machdep.h
+       ecoff_machdep.h
+       arguments.hh
+       stacktrace.hh
+       vtophys.hh
+       faults.hh
+       ev5.hh
         ''')
 
 # Generate the header.  target[0] is the full path of the output

diff --git a/base/loader/exec_aout.h b/base/loader/exec_aout.h
index 76ebe9bb5a0b14524e71bc635cec1683b1a82474..3863a92fbdff522fe053f5802ca4e00e1770513f 100644 (file)
--- a/base/loader/exec_aout.h
+++ b/base/loader/exec_aout.h
@@ -55,6 +55,6 @@
         (N_GETMAGIC(ex) != NMAGIC && N_GETMAGIC(ex) != OMAGIC && \
         N_GETMAGIC(ex) != ZMAGIC)
 
-#include "targetarch/aout_machdep.h"
+#include "arch/aout_machdep.h"
 
 #endif /* !_SYS_EXEC_AOUT_H_ */

diff --git a/base/loader/exec_ecoff.h b/base/loader/exec_ecoff.h
index 4eece43187a711abce3a6cc5012068ef95622e5d..79cd22a6ee6815343864e86bce9efd996e325813 100644 (file)
--- a/base/loader/exec_ecoff.h
+++ b/base/loader/exec_ecoff.h
@@ -37,7 +37,7 @@
 #ifndef        _SYS_EXEC_ECOFF_H_
 #define        _SYS_EXEC_ECOFF_H_
 
-#include "targetarch/ecoff_machdep.h"
+#include "arch/ecoff_machdep.h"
 
 struct ecoff_filehdr {
         coff_ushort f_magic;   /* magic number */

diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc
index 17ec21fed5286084c29a0698d9015b59332dd586..24280244feac61cfb8d4027c699c1f702d514862 100644 (file)
--- a/base/remote_gdb.cc
+++ b/base/remote_gdb.cc
@@ -129,7 +129,7 @@
 #include "cpu/static_inst.hh"
 #include "mem/functional/physical.hh"
 #include "sim/system.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 
 using namespace std;
 using namespace TheISA;

diff --git a/cpu/base_dyn_inst.cc b/cpu/base_dyn_inst.cc
index b3dffbf94a3109f7d71047ca4f2a05b904a2e851..5905cdad2aa91d2e20df46cd470a0865299b3489 100644 (file)
--- a/cpu/base_dyn_inst.cc
+++ b/cpu/base_dyn_inst.cc
@@ -36,7 +36,7 @@
 #include "base/cprintf.hh"
 #include "base/trace.hh"
 
-#include "targetarch/faults.hh"
+#include "arch/faults.hh"
 #include "cpu/exetrace.hh"
 #include "mem/mem_req.hh"
 

diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc
index 9bed3ba471be7662f650fb5421323e1eed6eab91..cf0ced7b052d660eebaa5c26e50bca6f317e3d45 100644 (file)
--- a/cpu/exec_context.cc
+++ b/cpu/exec_context.cc
@@ -40,7 +40,7 @@
 #include "sim/serialize.hh"
 #include "sim/sim_exit.hh"
 #include "sim/system.hh"
-#include "targetarch/stacktrace.hh"
+#include "arch/stacktrace.hh"
 #else
 #include "sim/process.hh"
 #endif

diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh
index 3e0d772549dc601aa90b48de8f1b1261033a52e2..4083381ea93e09eb7214f2a4b3642d5a107fe57e 100644 (file)
--- a/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@ -46,7 +46,7 @@ class BaseCPU;
 #if FULL_SYSTEM
 
 #include "sim/system.hh"
-#include "targetarch/alpha_memory.hh"
+#include "arch/alpha_memory.hh"
 
 class FunctionProfile;
 class ProfileNode;

diff --git a/cpu/o3/alpha_cpu_builder.cc b/cpu/o3/alpha_cpu_builder.cc
index 3547fb1b5246817ff85636519bc538230cbd0492..0f6d0d35c3c6abb486ec517b6bdd71ee77d5a849 100644 (file)
--- a/cpu/o3/alpha_cpu_builder.cc
+++ b/cpu/o3/alpha_cpu_builder.cc
@@ -50,8 +50,8 @@
 #include "mem/functional/memory_control.hh"
 #include "mem/functional/physical.hh"
 #include "sim/system.hh"
-#include "targetarch/alpha_memory.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/alpha_memory.hh"
+#include "arch/vtophys.hh"
 #else // !FULL_SYSTEM
 #include "mem/functional/functional.hh"
 #endif // FULL_SYSTEM

diff --git a/cpu/o3/cpu.hh b/cpu/o3/cpu.hh
index f9e4495481a4385e46c336de39a7cea314967162..802860ab5fbb26f9d942f31daef239d236559031 100644 (file)
--- a/cpu/o3/cpu.hh
+++ b/cpu/o3/cpu.hh
@@ -50,7 +50,7 @@
 #include "sim/process.hh"
 
 #if FULL_SYSTEM
-#include "targetarch/ev5.hh"
+#include "arch/ev5.hh"
 using namespace EV5;
 #endif
 

diff --git a/cpu/o3/regfile.hh b/cpu/o3/regfile.hh
index 9009db9195812a914bb75215d734ef7e3386f2a2..3bf96a37bcc452ce3670b7a4631b30dffe9b8978 100644 (file)
--- a/cpu/o3/regfile.hh
+++ b/cpu/o3/regfile.hh
@@ -32,13 +32,13 @@
 // @todo: Destructor
 
 #include "arch/isa_traits.hh"
-#include "targetarch/faults.hh"
+#include "arch/faults.hh"
 #include "base/trace.hh"
 #include "config/full_system.hh"
 #include "cpu/o3/comm.hh"
 
 #if FULL_SYSTEM
-#include "targetarch/ev5.hh"
+#include "arch/ev5.hh"
 #include "kern/kernel_stats.hh"
 
 using namespace EV5;

diff --git a/cpu/profile.hh b/cpu/profile.hh
index 18061f9bf2ad12b3e479b45a30039bfa9a9593f6..1eb012a2710b100476bc1cb4879e8f098735fca5 100644 (file)
--- a/cpu/profile.hh
+++ b/cpu/profile.hh
@@ -33,7 +33,7 @@
 
 #include "cpu/static_inst.hh"
 #include "sim/host.hh"
-#include "targetarch/stacktrace.hh"
+#include "arch/stacktrace.hh"
 
 class ProfileNode
 {

diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc
index 4693c78c9ba020467173feb3e541d3e8076d4072..02ecbb12ccf3aedd1c5abc86ef0df94ac00fa12c 100644 (file)
--- a/cpu/simple/cpu.cc
+++ b/cpu/simple/cpu.cc
@@ -67,9 +67,9 @@
 #include "mem/functional/memory_control.hh"
 #include "mem/functional/physical.hh"
 #include "sim/system.hh"
-#include "targetarch/alpha_memory.hh"
-#include "targetarch/stacktrace.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/alpha_memory.hh"
+#include "arch/stacktrace.hh"
+#include "arch/vtophys.hh"
 #else // !FULL_SYSTEM
 #include "mem/functional/functional.hh"
 #endif // FULL_SYSTEM

diff --git a/dev/ns_gige.cc b/dev/ns_gige.cc
index 4b08d8497c23379c83c5db54d437569d26bbfb8b..d6df347bc50dec0ec20696511526bad0726bd3b5 100644 (file)
--- a/dev/ns_gige.cc
+++ b/dev/ns_gige.cc
@@ -49,7 +49,7 @@
 #include "sim/debug.hh"
 #include "sim/host.hh"
 #include "sim/stats.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 
 const char *NsRxStateStrings[] =
 {

diff --git a/dev/sinic.cc b/dev/sinic.cc
index ba643de4b07e878c60445e80d6627a7441b42070..c28ab335b6d11c6062d99d1fc4cbc8a48b36b3f3 100644 (file)
--- a/dev/sinic.cc
+++ b/dev/sinic.cc
@@ -47,7 +47,7 @@
 #include "sim/eventq.hh"
 #include "sim/host.hh"
 #include "sim/stats.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 
 using namespace Net;
 using namespace TheISA;

diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc
index cead8caaf67257efc214e2d9de2998361a83003d..24d228b5ff23bb56ad81baff4401091abe0e7362 100644 (file)
--- a/kern/freebsd/freebsd_system.cc
+++ b/kern/freebsd/freebsd_system.cc
@@ -41,7 +41,7 @@
 #include "sim/builder.hh"
 #include "arch/isa_traits.hh"
 #include "sim/byteswap.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 
 #define TIMER_FREQUENCY 1193180
 

diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc
index c5a9e184ad9947ab456cd584e8bd458dface82b2..eb189658c28903074973776889ab79594101976b 100644 (file)
--- a/kern/linux/linux_system.cc
+++ b/kern/linux/linux_system.cc
@@ -46,8 +46,8 @@
 #include "sim/builder.hh"
 #include "sim/byteswap.hh"
 #include "dev/platform.hh"
-#include "targetarch/arguments.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/arguments.hh"
+#include "arch/vtophys.hh"
 
 using namespace std;
 using namespace TheISA;

diff --git a/kern/linux/printk.cc b/kern/linux/printk.cc
index fbc8bdad1c8c32557bc068b0285384f469f01797..f5313759be5f2098b0fc077ccfdef4f1540782a3 100644 (file)
--- a/kern/linux/printk.cc
+++ b/kern/linux/printk.cc
@@ -30,7 +30,7 @@
 #include <algorithm>
 
 #include "base/trace.hh"
-#include "targetarch/arguments.hh"
+#include "arch/arguments.hh"
 
 using namespace std;
 

diff --git a/kern/tru64/dump_mbuf.cc b/kern/tru64/dump_mbuf.cc
index efdaed62d576d04b9ea84ed9f9450bc85d101f61..10137ceb031cc9a56717aa70e2a78fecfa16065f 100644 (file)
--- a/kern/tru64/dump_mbuf.cc
+++ b/kern/tru64/dump_mbuf.cc
@@ -34,9 +34,9 @@
 #include "cpu/exec_context.hh"
 #include "kern/tru64/mbuf.hh"
 #include "sim/host.hh"
-#include "targetarch/arguments.hh"
+#include "arch/arguments.hh"
 #include "arch/isa_traits.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 
 using namespace TheISA;
 

diff --git a/kern/tru64/printf.cc b/kern/tru64/printf.cc
index 12a089c40bebd80298eacd4716f33354940c3a8e..77ac17c3aff09be1502693bd51e422b86b2f4307 100644 (file)
--- a/kern/tru64/printf.cc
+++ b/kern/tru64/printf.cc
@@ -32,8 +32,8 @@
 #include "base/cprintf.hh"
 #include "base/trace.hh"
 #include "sim/host.hh"
-#include "targetarch/arguments.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/arguments.hh"
+#include "arch/vtophys.hh"
 
 using namespace std;
 

diff --git a/kern/tru64/tru64_events.cc b/kern/tru64/tru64_events.cc
index 2fe6a2dc44c7a3b01cd0c6315f7f942e3203c977..1fd26b87bc500f63e45f25c65cc450ff81a513d4 100644 (file)
--- a/kern/tru64/tru64_events.cc
+++ b/kern/tru64/tru64_events.cc
@@ -33,7 +33,7 @@
 #include "kern/tru64/dump_mbuf.hh"
 #include "kern/tru64/printf.hh"
 #include "mem/functional/memory_control.hh"
-#include "targetarch/arguments.hh"
+#include "arch/arguments.hh"
 #include "arch/isa_traits.hh"
 
 using namespace TheISA;

diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc
index ebcdc15532cc8d684ee6b3b10e4ef5864d938e50..48e02d90b81b69decadf28ef9c3359d2c9881ca6 100644 (file)
--- a/kern/tru64/tru64_system.cc
+++ b/kern/tru64/tru64_system.cc
@@ -37,7 +37,7 @@
 #include "mem/functional/physical.hh"
 #include "sim/builder.hh"
 #include "arch/isa_traits.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 
 using namespace std;
 

diff --git a/sim/process.cc b/sim/process.cc
index 171470eb203aab9bd384c6ee81922ed906970525..f026afc519444db64140efdf710cdeac8d4fdda2 100644 (file)
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -48,8 +48,8 @@
 #include "sim/stats.hh"
 #include "sim/syscall_emul.hh"
 
-#include "targetarch/alpha_tru64_process.hh"
-#include "targetarch/alpha_linux_process.hh"
+#include "arch/alpha_tru64_process.hh"
+#include "arch/alpha_linux_process.hh"
 
 using namespace std;
 using namespace TheISA;

diff --git a/sim/pseudo_inst.cc b/sim/pseudo_inst.cc
index 58ea8266f0bd23d899af9bd6670ea01263589d9f..36c854d1c7789bf59bfc54aee35273a700f5cbbf 100644 (file)
--- a/sim/pseudo_inst.cc
+++ b/sim/pseudo_inst.cc
@@ -34,7 +34,7 @@
 #include <string>
 
 #include "sim/pseudo_inst.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 #include "cpu/base.hh"
 #include "cpu/sampler/sampler.hh"
 #include "cpu/exec_context.hh"

diff --git a/sim/system.cc b/sim/system.cc
index 41de8cee466afdccff71c7bd51da8cef02f40408..378568a8a0dc66a0b3644f5884f11c7d40baa1b5 100644 (file)
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -33,7 +33,7 @@
 #include "kern/kernel_stats.hh"
 #include "mem/functional/memory_control.hh"
 #include "mem/functional/physical.hh"
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 #include "sim/builder.hh"
 #include "arch/isa_traits.hh"
 #include "sim/byteswap.hh"

diff --git a/sim/vptr.hh b/sim/vptr.hh
index 7ec43602d70a95e1bdf6f03ca82e68588421d471..0ec452f25b7660e283a63b911b5e970d0c3c5c79 100644 (file)
--- a/sim/vptr.hh
+++ b/sim/vptr.hh
@@ -29,7 +29,7 @@
 #ifndef __ARCH_ALPHA_VPTR_HH__
 #define __ARCH_ALPHA_VPTR_HH__
 
-#include "targetarch/vtophys.hh"
+#include "arch/vtophys.hh"
 #include "arch/isa_traits.hh"
 
 class ExecContext;