diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-27 05:35:43 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-27 05:35:43 -0500 |
commit | c5dcd152f264a837f50d39f98d0f4f81478e3553 (patch) | |
tree | 62a6b09123a49ca186c25395f849d3b3aa2aa9d9 | |
parent | f56d42c53dbea1017d4fdd6b9f4ff9e976538246 (diff) | |
download | gem5-c5dcd152f264a837f50d39f98d0f4f81478e3553.tar.xz |
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
-rw-r--r-- | SConscript | 30 | ||||
-rw-r--r-- | arch/SConscript | 10 | ||||
-rw-r--r-- | base/loader/exec_aout.h | 2 | ||||
-rw-r--r-- | base/loader/exec_ecoff.h | 2 | ||||
-rw-r--r-- | base/remote_gdb.cc | 2 | ||||
-rw-r--r-- | cpu/base_dyn_inst.cc | 2 | ||||
-rw-r--r-- | cpu/exec_context.cc | 2 | ||||
-rw-r--r-- | cpu/exec_context.hh | 2 | ||||
-rw-r--r-- | cpu/o3/alpha_cpu_builder.cc | 4 | ||||
-rw-r--r-- | cpu/o3/cpu.hh | 2 | ||||
-rw-r--r-- | cpu/o3/regfile.hh | 4 | ||||
-rw-r--r-- | cpu/profile.hh | 2 | ||||
-rw-r--r-- | cpu/simple/cpu.cc | 6 | ||||
-rw-r--r-- | dev/ns_gige.cc | 2 | ||||
-rw-r--r-- | dev/sinic.cc | 2 | ||||
-rw-r--r-- | kern/freebsd/freebsd_system.cc | 2 | ||||
-rw-r--r-- | kern/linux/linux_system.cc | 4 | ||||
-rw-r--r-- | kern/linux/printk.cc | 2 | ||||
-rw-r--r-- | kern/tru64/dump_mbuf.cc | 4 | ||||
-rw-r--r-- | kern/tru64/printf.cc | 4 | ||||
-rw-r--r-- | kern/tru64/tru64_events.cc | 2 | ||||
-rw-r--r-- | kern/tru64/tru64_system.cc | 2 | ||||
-rw-r--r-- | sim/process.cc | 4 | ||||
-rw-r--r-- | sim/pseudo_inst.cc | 2 | ||||
-rw-r--r-- | sim/system.cc | 2 | ||||
-rw-r--r-- | sim/vptr.hh | 2 |
26 files changed, 57 insertions, 47 deletions
diff --git a/SConscript b/SConscript index 966cb6d3e..540876699 100644 --- 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 d237b0b1f..2036b6a56 100644 --- 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 76ebe9bb5..3863a92fb 100644 --- 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 4eece4318..79cd22a6e 100644 --- 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 17ec21fed..24280244f 100644 --- 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 b3dffbf94..5905cdad2 100644 --- 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 9bed3ba47..cf0ced7b0 100644 --- 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 3e0d77254..4083381ea 100644 --- 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 3547fb1b5..0f6d0d35c 100644 --- 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 f9e449548..802860ab5 100644 --- 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 9009db919..3bf96a37b 100644 --- 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 18061f9bf..1eb012a27 100644 --- 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 4693c78c9..02ecbb12c 100644 --- 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 4b08d8497..d6df347bc 100644 --- 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 ba643de4b..c28ab335b 100644 --- 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 cead8caaf..24d228b5f 100644 --- 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 c5a9e184a..eb189658c 100644 --- 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 fbc8bdad1..f5313759b 100644 --- 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 efdaed62d..10137ceb0 100644 --- 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 12a089c40..77ac17c3a 100644 --- 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 2fe6a2dc4..1fd26b87b 100644 --- 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 ebcdc1553..48e02d90b 100644 --- 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 171470eb2..f026afc51 100644 --- 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 58ea8266f..36c854d1c 100644 --- 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 41de8cee4..378568a8a 100644 --- 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 7ec43602d..0ec452f25 100644 --- 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; |