Merge ktlim@zamp:./local/clean/o3-merge/m5

into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

configs/boot/micro_memlat.rcS:
configs/boot/micro_tlblat.rcS:
src/arch/alpha/ev5.cc:
src/arch/alpha/isa/decoder.isa:
src/arch/alpha/isa_traits.hh:
src/cpu/base.cc:
src/cpu/base.hh:
src/cpu/base_dyn_inst.hh:
src/cpu/checker/cpu.hh:
src/cpu/checker/cpu_impl.hh:
src/cpu/o3/alpha/cpu_impl.hh:
src/cpu/o3/alpha/params.hh:
src/cpu/o3/checker_builder.cc:
src/cpu/o3/commit_impl.hh:
src/cpu/o3/cpu.cc:
src/cpu/o3/decode_impl.hh:
src/cpu/o3/fetch_impl.hh:
src/cpu/o3/iew.hh:
src/cpu/o3/iew_impl.hh:
src/cpu/o3/inst_queue.hh:
src/cpu/o3/lsq.hh:
src/cpu/o3/lsq_impl.hh:
src/cpu/o3/lsq_unit.hh:
src/cpu/o3/lsq_unit_impl.hh:
src/cpu/o3/regfile.hh:
src/cpu/o3/rename_impl.hh:
src/cpu/o3/thread_state.hh:
src/cpu/ozone/checker_builder.cc:
src/cpu/ozone/cpu.hh:
src/cpu/ozone/cpu_impl.hh:
src/cpu/ozone/front_end.hh:
src/cpu/ozone/front_end_impl.hh:
src/cpu/ozone/lw_back_end.hh:
src/cpu/ozone/lw_back_end_impl.hh:
src/cpu/ozone/lw_lsq.hh:
src/cpu/ozone/lw_lsq_impl.hh:
src/cpu/ozone/thread_state.hh:
src/cpu/simple/base.cc:
src/cpu/simple_thread.cc:
src/cpu/simple_thread.hh:
src/cpu/thread_state.hh:
src/dev/ide_disk.cc:
src/python/m5/objects/O3CPU.py:
src/python/m5/objects/Root.py:
src/python/m5/objects/System.py:
src/sim/pseudo_inst.cc:
src/sim/pseudo_inst.hh:
src/sim/system.hh:
util/m5/m5.c:
    Hand merge.

--HG--
rename : arch/alpha/ev5.cc => src/arch/alpha/ev5.cc
rename : arch/alpha/freebsd/system.cc => src/arch/alpha/freebsd/system.cc
rename : arch/alpha/isa/decoder.isa => src/arch/alpha/isa/decoder.isa
rename : arch/alpha/isa/mem.isa => src/arch/alpha/isa/mem.isa
rename : arch/alpha/isa_traits.hh => src/arch/alpha/isa_traits.hh
rename : arch/alpha/linux/system.cc => src/arch/alpha/linux/system.cc
rename : arch/alpha/system.cc => src/arch/alpha/system.cc
rename : arch/alpha/tru64/system.cc => src/arch/alpha/tru64/system.cc
rename : cpu/base.cc => src/cpu/base.cc
rename : cpu/base.hh => src/cpu/base.hh
rename : cpu/base_dyn_inst.hh => src/cpu/base_dyn_inst.hh
rename : cpu/checker/cpu.hh => src/cpu/checker/cpu.hh
rename : cpu/checker/cpu.cc => src/cpu/checker/cpu_impl.hh
rename : cpu/o3/alpha_cpu_builder.cc => src/cpu/o3/alpha/cpu_builder.cc
rename : cpu/checker/o3_cpu_builder.cc => src/cpu/o3/checker_builder.cc
rename : cpu/o3/commit_impl.hh => src/cpu/o3/commit_impl.hh
rename : cpu/o3/cpu.cc => src/cpu/o3/cpu.cc
rename : cpu/o3/fetch_impl.hh => src/cpu/o3/fetch_impl.hh
rename : cpu/o3/iew.hh => src/cpu/o3/iew.hh
rename : cpu/o3/iew_impl.hh => src/cpu/o3/iew_impl.hh
rename : cpu/o3/inst_queue.hh => src/cpu/o3/inst_queue.hh
rename : cpu/o3/inst_queue_impl.hh => src/cpu/o3/inst_queue_impl.hh
rename : cpu/o3/lsq_impl.hh => src/cpu/o3/lsq_impl.hh
rename : cpu/o3/lsq_unit.hh => src/cpu/o3/lsq_unit.hh
rename : cpu/o3/lsq_unit_impl.hh => src/cpu/o3/lsq_unit_impl.hh
rename : cpu/o3/mem_dep_unit_impl.hh => src/cpu/o3/mem_dep_unit_impl.hh
rename : cpu/o3/rename.hh => src/cpu/o3/rename.hh
rename : cpu/o3/rename_impl.hh => src/cpu/o3/rename_impl.hh
rename : cpu/o3/thread_state.hh => src/cpu/o3/thread_state.hh
rename : cpu/o3/tournament_pred.cc => src/cpu/o3/tournament_pred.cc
rename : cpu/o3/tournament_pred.hh => src/cpu/o3/tournament_pred.hh
rename : cpu/checker/cpu_builder.cc => src/cpu/ozone/checker_builder.cc
rename : cpu/ozone/cpu.hh => src/cpu/ozone/cpu.hh
rename : cpu/ozone/cpu_builder.cc => src/cpu/ozone/cpu_builder.cc
rename : cpu/ozone/cpu_impl.hh => src/cpu/ozone/cpu_impl.hh
rename : cpu/ozone/front_end.hh => src/cpu/ozone/front_end.hh
rename : cpu/ozone/front_end_impl.hh => src/cpu/ozone/front_end_impl.hh
rename : cpu/ozone/inorder_back_end_impl.hh => src/cpu/ozone/inorder_back_end_impl.hh
rename : cpu/ozone/inst_queue_impl.hh => src/cpu/ozone/inst_queue_impl.hh
rename : cpu/ozone/lw_back_end.hh => src/cpu/ozone/lw_back_end.hh
rename : cpu/ozone/lw_back_end_impl.hh => src/cpu/ozone/lw_back_end_impl.hh
rename : cpu/ozone/lw_lsq.hh => src/cpu/ozone/lw_lsq.hh
rename : cpu/ozone/lw_lsq_impl.hh => src/cpu/ozone/lw_lsq_impl.hh
rename : cpu/ozone/simple_params.hh => src/cpu/ozone/simple_params.hh
rename : cpu/ozone/thread_state.hh => src/cpu/ozone/thread_state.hh
rename : cpu/simple/cpu.cc => src/cpu/simple/base.cc
rename : cpu/cpu_exec_context.cc => src/cpu/simple_thread.cc
rename : cpu/thread_state.hh => src/cpu/thread_state.hh
rename : dev/ide_disk.hh => src/dev/ide_disk.hh
rename : python/m5/objects/BaseCPU.py => src/python/m5/objects/BaseCPU.py
rename : python/m5/objects/AlphaFullCPU.py => src/python/m5/objects/O3CPU.py
rename : python/m5/objects/OzoneCPU.py => src/python/m5/objects/OzoneCPU.py
rename : python/m5/objects/Root.py => src/python/m5/objects/Root.py
rename : python/m5/objects/System.py => src/python/m5/objects/System.py
rename : sim/eventq.hh => src/sim/eventq.hh
rename : sim/pseudo_inst.cc => src/sim/pseudo_inst.cc
rename : sim/pseudo_inst.hh => src/sim/pseudo_inst.hh
rename : sim/serialize.cc => src/sim/serialize.cc
rename : sim/stat_control.cc => src/sim/stat_control.cc
rename : sim/stat_control.hh => src/sim/stat_control.hh
rename : sim/system.hh => src/sim/system.hh
extra : convert_revision : 135d90e43f6cea89f9460ba4e23f4b0b85886e7d

1 files changed, 94 insertions, 0 deletions

diff --git a/configs/boot/equake.symbol b/configs/boot/equake.symbol
new file mode 100644
index 000000000..4b28299c1
--- /dev/null
+++ b/configs/boot/equake.symbol
@@ -0,0 +1,94 @@
+000000012001a868 S ARCHcholeskylen
+000000012001a878 S ARCHcoord
+000000012001a930 S ARCHcorners
+000000012001a938 S ARCHduration
+000000012001a940 S ARCHelems
+000000012001a8b0 S ARCHglobalelem
+000000012001a8d0 S ARCHglobalelems
+000000012001a8e8 S ARCHglobalnode
+000000012001a8a8 S ARCHglobalnodes
+000000012001a8d8 S ARCHmatrixcol
+000000012001a898 S ARCHmatrixindex
+000000012001a924 S ARCHmatrixlen
+000000012001a8ac S ARCHmesh_dim
+000000012001a8f8 S ARCHmine
+000000012001a90c S ARCHnodes
+000000012001a908 S ARCHpriv
+000000012001a920 S ARCHsubdomains
+000000012001a8b8 S ARCHvertex
+000000012001a900 S C
+000000012001a918 S C23
+000000012001a9a8 B Damp
+000000012001a9c8 B Exc
+000000012001a8a0 S K
+000000012001a928 S M
+000000012001a888 S M23
+000000012001a950 B Src
+000000012001a890 S V23
+000000012001a388 D _DYNAMIC
+000000012001a5f8 D _GLOBAL_OFFSET_TABLE_
+000000012001a848 G _IO_stdin_used
+000000012001a550 T _PROCEDURE_LINKAGE_TABLE_
+000000012001a530 d __CTOR_END__
+000000012001a528 d __CTOR_LIST__
+000000012001a540 d __DTOR_END__
+000000012001a538 d __DTOR_LIST__
+000000012001a384 r __FRAME_END__
+000000012001a548 d __JCR_END__
+000000012001a548 d __JCR_LIST__
+000000012001a860 A __bss_start
+000000012001a000 D __data_start
+0000000120008c50 t __do_global_ctors_aux
+00000001200008d0 t __do_global_dtors_aux
+000000012001a850 G __dso_handle
+000000012001a000 A __fini_array_end
+000000012001a000 A __fini_array_start
+000000012001a000 A __init_array_end
+000000012001a000 A __init_array_start
+0000000120008bb0 T __libc_csu_fini
+0000000120008b00 T __libc_csu_init
+0000000120000890 W __start
+000000012001a860 A _edata
+000000012001a9e0 A _end
+0000000120008cb0 T _fini
+0000000120000828 T _init
+0000000120000890 T _start
+00000001200049c4 T abe_matrix
+00000001200056b8 T arch_bail
+00000001200056e4 T arch_info
+0000000120006584 T arch_init
+00000001200057e0 T arch_parsecommandline
+0000000120005bf4 T arch_readdouble
+0000000120005ad0 T arch_readelemvector
+00000001200059ac T arch_readnodevector
+0000000120004530 T area_triangle
+00000001200051e8 T centroid
+000000012001a860 s completed.1
+000000012001a000 W data_start
+000000012001a948 S disp
+00000001200050bc T distance
+0000000120003c70 T element_matrices
+0000000120000970 t frame_dummy
+00000001200036f8 T get_Enu
+0000000120003820 T inv_J
+00000001200009c0 T main
+0000000120007a88 T mem_init
+00000001200054b8 T mv12x12
+000000012001a8c0 S nodekind
+000000012001a910 S nodekindf
+000000012001a8f0 S options
+000000012001a858 g p.0
+000000012001a8c8 S packfile
+0000000120004bc4 T phi0
+0000000120004cc4 T phi1
+0000000120004d98 T phi2
+00000001200052e8 T point2fault
+000000012001a870 S progname
+0000000120005cd8 T readpackfile
+000000012000360c T shape_ders
+0000000120004e84 T slip
+0000000120006604 T smvp
+00000001200070f8 T smvp_opt
+000000012001a880 S source_elms
+000000012001a8e0 S vel
+000000012000561c T vv12x12