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, 268 insertions, 0 deletions

diff --git a/configs/boot/gzip.symbol b/configs/boot/gzip.symbol
new file mode 100644
index 000000000..d965c99a9
--- /dev/null
+++ b/configs/boot/gzip.symbol
@@ -0,0 +1,268 @@
+0000000120022c08 D _DYNAMIC
+0000000120022fd0 D _GLOBAL_OFFSET_TABLE_
+0000000120023498 G _IO_stdin_used
+0000000120022dc0 T _PROCEDURE_LINKAGE_TABLE_
+0000000120022da0 d __CTOR_END__
+0000000120022d98 d __CTOR_LIST__
+0000000120022db0 d __DTOR_END__
+0000000120022da8 d __DTOR_LIST__
+0000000120022c04 r __FRAME_END__
+0000000120022db8 d __JCR_END__
+0000000120022db8 d __JCR_LIST__
+00000001200234f8 A __bss_start
+0000000120021030 D __data_start
+000000012000fbc0 t __do_global_ctors_aux
+00000001200012a0 t __do_global_dtors_aux
+00000001200234a0 G __dso_handle
+0000000120021030 A __fini_array_end
+0000000120021030 A __fini_array_start
+0000000120021030 A __init_array_end
+0000000120021030 A __init_array_start
+000000012000fb20 T __libc_csu_fini
+000000012000fa70 T __libc_csu_init
+0000000120001260 W __start
+00000001200234f8 A _edata
+0000000120073b10 A _end
+000000012000fc20 T _fini
+00000001200011f8 T _init
+0000000120001260 T _start
+0000000120004cf0 T abort_gzip
+000000012000de80 T add_envopt
+0000000120023550 S args
+0000000120023520 S ascii
+000000012002551c b base_dist
+00000001200254a8 b base_length
+0000000120023698 S bb
+00000001200234fc s bi_buf
+0000000120001ad0 T bi_init
+0000000120001b20 T bi_reverse
+0000000120023500 s bi_valid
+00000001200015d0 T bi_windup
+00000001200235b8 s bitbuf
+00000001200235e0 s bitbuf
+00000001200235c0 s bitcount
+0000000120023690 S bk
+0000000120024654 b bl_count
+0000000120021830 d bl_desc
+0000000120021858 d bl_order
+00000001200245b8 b bl_tree
+00000001200234ec G block_mode
+0000000120023610 S block_start
+00000001200235b4 s blocksize
+0000000120021540 d border
+0000000120009620 t build_tree
+0000000120023650 S bytes_in
+0000000120023668 S bytes_out
+0000000120004740 t check_ofname
+000000012000d5c0 T check_zipfile
+000000012000e540 T clear_bufs
+00000001200234f8 s completed.1
+0000000120023518 s compr_level
+00000001200092e0 t compress_block
+00000001200235a0 s compressed_len
+0000000120021030 d configuration_table
+000000012000e280 T copy
+00000001200017d0 T copy_block
+0000000120004ae0 t copy_stat
+0000000120021644 d cpdext
+0000000120021608 d cpdist
+000000012002158c d cplens
+00000001200215ca d cplext
+00000001200235f8 s crc
+00000001200234f0 g crc.0
+0000000120021870 D crc_32_tab
+0000000120002b90 t create_outfile
+0000000120008450 T ct_init
+0000000120008f60 T ct_tally
+000000012002ea20 B d_buf
+0000000120021808 d d_desc
+0000000120021030 W data_start
+00000001200234e8 G dbglvl
+00000001200234e4 G dbits
+0000000120008440 T debug_time
+000000012000a5e0 t decode
+000000012000ad50 t decode_c
+000000012000ab90 t decode_start
+0000000120023528 S decompress
+00000001200236c0 S decrypt
+0000000120002250 T deflate
+0000000120002770 t deflate_fast
+0000000120024f68 b depth
+000000012000ee70 T display_ratio
+00000001200252a5 b dist_code
+0000000120004c60 t do_exit
+0000000120003f00 t do_list
+0000000120023540 S do_lzw
+00000001200235c8 s done
+0000000120023fcc b dyn_dtree
+00000001200236d8 b dyn_ltree
+0000000120023678 S env
+000000012002350c s eofile
+000000012000e1c0 T error
+0000000120023548 S exit_code
+00000001200235f4 S ext_header
+0000000120021794 d extra_blbits
+000000012002171c d extra_dbits
+00000001200216a8 d extra_lbits
+00000001200236b8 S file_method
+000000012000f9c0 T file_read
+00000001200236b0 S file_type
+000000012000e580 T fill_inbuf
+0000000120002030 t fill_window
+00000001200234d8 g first_time.2
+000000012002358d s flag_bit
+0000000120025594 b flag_buf
+000000012002358c s flags
+0000000120008ba0 T flush_block
+000000012000e730 T flush_outbuf
+000000012000e860 T flush_window
+000000012002352c S force
+0000000120023640 S foreground
+0000000120001340 t frame_dummy
+000000012000a1a0 t gen_bitlen
+0000000120008a80 t gen_codes
+0000000120002dd0 t get_istat
+00000001200032c0 T get_method
+0000000120004d50 t get_suffix
+0000000120023618 S good_match
+000000012000ebf0 T gzipbasename
+00000001200236d0 S header_bytes
+0000000120024674 b heap
+0000000120023578 s heap_len
+000000012002357c s heap_max
+00000001200214b8 d help_msg.5
+0000000120004ee0 T huft_build
+0000000120005670 T huft_free
+00000001200236a0 S hufts
+00000001200235b0 s i.0
+0000000120023688 S ifd
+0000000120023658 S ifile_size
+000000012005eea8 B ifname
+000000012002356c s in_exit.4
+00000001200269e0 B inbuf
+0000000120006e00 T inflate
+0000000120006bf0 T inflate_block
+00000001200056d0 T inflate_codes
+00000001200062b0 T inflate_dynamic
+00000001200060f0 T inflate_fixed
+0000000120005e10 T inflate_stored
+0000000120008960 t init_block
+0000000120023684 S inptr
+00000001200235a8 s input_len
+0000000120023508 s ins_h
+0000000120023644 S insize
+000000012003ea20 B istat
+00000001200235c4 s j
+00000001200236c8 S key
+00000001200213f8 d known_suffixes.0
+00000001200217e0 d l_desc
+0000000120023584 s last_dist
+0000000120023588 s last_flags
+0000000120023580 s last_lit
+000000012002364c S last_member
+00000001200234e0 G lbits
+0000000120026910 b leaves
+00000001200251a5 b length_code
+00000001200234c8 G level
+0000000120021080 d license_msg
+0000000120023534 S list
+00000001200268a8 b lit_base
+00000001200267a8 b literal
+0000000120001b60 T lm_init
+0000000120001d90 T longest_match
+00000001200210f8 D longopts
+0000000120023510 s lookahead
+0000000120006ed0 T lzw
+0000000120007a80 T main
+0000000120003040 t make_ofname
+000000012000ec40 T make_simple_name
+000000012000c130 t make_table
+0000000120021680 D mask_bits
+0000000120023624 S match_start
+000000012002361c S max_chain_length
+0000000120023514 s max_lazy_match
+00000001200235d8 s max_len
+00000001200234c0 G maxbits
+00000001200234c4 G method
+0000000120021470 d methods.3
+0000000120023570 s msg_done
+0000000120004310 t name_too_long
+0000000120023608 S nice_match
+00000001200234b8 G no_name
+00000001200234bc G no_time
+0000000120023630 S ofd
+000000012003eaa8 B ofname
+0000000120023590 s opt_len
+00000001200235d0 s orig_len
+000000012005f2a8 B outbuf
+0000000120023648 S outcnt
+00000001200234a8 g p.0
+0000000120026978 b parents
+0000000120023680 S part_nb
+00000001200235dc s peek_bits
+00000001200235f0 S pkzip
+000000012003eea8 B prev
+000000012002360c S prev_length
+0000000120023628 S progname
+0000000120026594 b pt_len
+00000001200265a8 b pt_table
+000000012002353c S quiet
+00000001200080c0 T ran
+0000000120023600 S read_buf
+000000012000b8c0 t read_c_len
+000000012000ed50 T read_error
+000000012000b130 t read_pt_len
+000000012000d2a0 t read_tree
+0000000120023530 S recursive
+0000000120023568 S remove_ofname
+0000000120023660 S save_orig_name
+0000000120009d90 t scan_tree
+00000001200236a8 S seedi
+0000000120001390 T send_bits
+0000000120009f40 t send_tree
+0000000120009540 t set_file_type
+0000000120004420 t shorten_name
+0000000120007f90 T spec_compress
+0000000120073ac8 B spec_fd
+0000000120007800 T spec_getc
+0000000120006f70 T spec_init
+0000000120007f40 T spec_initbufs
+0000000120007430 T spec_load
+0000000120008350 T spec_putc
+0000000120007090 T spec_random_load
+0000000120007670 T spec_read
+00000001200081b0 T spec_reset
+0000000120008190 T spec_rewind
+0000000120008010 T spec_uncompress
+0000000120007930 T spec_ungetc
+0000000120008210 T spec_write
+0000000120024540 b static_dtree
+0000000120023598 s static_len
+00000001200240c0 b static_ltree
+000000012000eb20 T strlwr
+0000000120023620 S strstart
+00000001200235bc s subbitbuf
+0000000120021440 d suffixes.1
+0000000120023544 S test
+0000000120023638 S time_stamp
+0000000120023524 S to_stdout
+0000000120023558 S total_in
+0000000120023560 S total_out
+000000012000a510 T unlzh
+000000012000c5c0 T unlzw
+000000012000cde0 T unpack
+000000012000d7a0 T unzip
+000000012000e4c0 T updcrc
+00000001200235e8 s valid
+0000000120023538 S verbose
+000000012000ecd0 T warn
+0000000120063aa8 B window
+00000001200234b0 G window_size
+00000001200234d0 G work
+000000012000ea20 T write_buf
+000000012000ee00 T write_error
+000000012000e220 T xmalloc
+0000000120023670 S z_len
+0000000120073aa8 B z_suffix
+0000000120023504 s zfile
+000000012000ef80 T zip