Commit graph

7629 commits

Author SHA1 Message Date
Steve Reinhardt
8f1855034e Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : 8bfe9a5cb1f127b52e4f189eb1193f7d1c93e580
2003-10-13 19:54:11 -07:00
Nathan Binkert
481aaf03cf Small optimization
cpu/pc_event.cc:
cpu/pc_event.hh:
    Do a quick check to see if there is anything to service
    before the function is called

--HG--
extra : convert_revision : 16e9b6284ece8b7a53ccf0ca200fab9ba780c50c
2003-10-13 22:19:43 -04:00
Nathan Binkert
f94ff9ace5 Split up kernel.cc into separate files for dump_mbuf and printf
cpu/exec_context.hh:
dev/alpha_console.cc:
sim/system.cc:
sim/system.hh:
    Convert from fixed array to a vector
arch/alpha/arguments.hh:
    now that CopyData and CopyString are in vtophys.hh, this
    include is not necessary
arch/alpha/vtophys.hh:
    Include isa_traits.hh for Addr
cpu/pc_event.cc:
    Temporarily get this working while we're changing things

--HG--
extra : convert_revision : 9a7597b7bd5d050819766f8edf7a02f28447b9ca
2003-10-13 17:24:27 -04:00
Nathan Binkert
2471c214bf cleanup
arch/alpha/arguments.hh:
arch/alpha/arguments.cc:
    sort #includes

--HG--
extra : convert_revision : f152f2fa1479649e7376e2a24107da642c7da5aa
2003-10-13 16:14:28 -04:00
Nathan Binkert
60a7bd950b CopyData and CopyString moved from kernel.cc to vtophys.cc
kernel.cc and kernel.hh moved to kern/tru64

--HG--
extra : convert_revision : 1b9123af03960b602a2d52dfa7b714280f9995aa
2003-10-13 16:09:33 -04:00
Steve Reinhardt
7646a5a1e0 Add m5 emacs style file.
--HG--
extra : convert_revision : bccc866984c98d974c1745f125293d781d6d0b1e
2003-10-13 08:04:38 -07:00
Nathan Binkert
b177f696ff Try to get the correct license on various files
remove stuff that is ambiguous
Clean up code a bit

arch/alpha/aout_machdep.h:
    Add M5 License
docs/stl.hh:
    M5 license
base/remote_gdb.cc:
    Most of this is mine, so stick in the m5 license
dev/console.hh:
    Clean up comments
    merge simple() and out() into one function.
dev/console.hh:
dev/console.cc:
    m5 license
dev/console.cc:
    merge simple and out.
    remove dead code
dev/console.cc:
    Remove comments that weren't mine.
    Clean up code
dev/console.hh:
    update names
dev/alpha_console.cc:
    use new interface

--HG--
extra : convert_revision : 3cd2357e1525db43c2ef9e89a9b47a47861d6af9
2003-10-13 02:00:47 -04:00
Nathan Binkert
940c214759 Pisa is way out of date. Whack it for now. Hopefully
someone will resurrect it some day.

--HG--
extra : convert_revision : 2e28ef2b2a4f3d8ca395d9e2bb167aacdf30e755
2003-10-12 22:22:29 -04:00
Steve Reinhardt
94955d1221 Get rid of obsolete sim/cache directory.
--HG--
extra : convert_revision : 2654df50023352b2b8d8442f7f0248253de44991
2003-10-11 21:51:14 -07:00
Nathan Binkert
7d64ac98d5 get rid of implicit rules
--HG--
extra : convert_revision : ee5cd45d28c511f7a40f2d438a8a31c208c48547
2003-10-11 00:35:06 -04:00
Erik Hallnor
025ab84ed7 Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 84ba90689683c41988ef89a8bb787e9a6620b668
2003-10-10 23:23:44 -04:00
Erik Hallnor
d6a5a622a5 Fully Document Statistics::Detail::Stat. More to follow.
--HG--
extra : convert_revision : 29983a074ab367a88995f0aa231019ff0a7c644e
2003-10-10 23:23:30 -04:00
Nathan Binkert
b61ec9773a Make things work on OpenBSD again
sim/sim_time.cc:
    make this work in OpenBSD
sim/sim_time.hh:
    timeval is defined in sys/time.h
base/remote_gdb.cc:
    need to include <cstdio> for sprintf

--HG--
extra : convert_revision : a230aa691bb798c37243fe4253399b2e40a2d12d
2003-10-10 22:59:51 -04:00
Nathan Binkert
6770411543 fix includes
base/statistics.hh:
    need to use explicit path for #includes

--HG--
extra : convert_revision : da51315ee283746636957f5f506d7715ed52764d
2003-10-10 21:17:06 -04:00
Lisa Hsu
dfd15ec34a Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
--HG--
extra : convert_revision : d1be5fea671fa3befc286139eca5c0def6fe245c
2003-10-10 15:59:51 -04:00
Lisa Hsu
86c8eb7b9f statistics.hh:
Grouped the Visible Stats Types and commented them.

base/statistics.hh:
    Grouped the Visible Stats Types and commented them.

--HG--
extra : convert_revision : b5ef457a8c3f26ce5d614e3517bb0a5a4e063202
2003-10-10 15:58:56 -04:00
Nathan Binkert
3d55a263fd This is a utility.
--HG--
extra : convert_revision : b9ec17d8f3a11f75872001351119c398adffc98d
2003-10-10 15:09:25 -04:00
Nathan Binkert
f794b3ca98 old is not needed anymore
--HG--
extra : convert_revision : 60f25a78c9b34c46fce813768f1a288bb85f6918
2003-10-10 14:47:12 -04:00
Nathan Binkert
b7e569b96d Get rid of all of the Attic Directories.
They are still under revision control though.

--HG--
extra : convert_revision : 218a1a23be6c9ab1f8dbfd8ad159220546d2f379
2003-10-10 14:45:26 -04:00
Steve Reinhardt
d84333ee37 New perl script to find all the files you might care about (so people can stop
complaining about extra bk dirs).  Feel free to request features (or better yet
add them yourself).

--HG--
extra : convert_revision : 744bb0f5311fc665098273e2cb6e3c8d0c867e06
2003-10-10 11:12:11 -07:00
Steve Reinhardt
401c87a765 Get rid of this one too (should have been in last changeset).
--HG--
extra : convert_revision : 242bb82ad83aac4028fe54093ebea683fff796d7
2003-10-10 11:11:24 -07:00
Steve Reinhardt
0559d4587b Get rid of support files/scripts from directory re-org. Hopefully we won't do this again;
if so we can resurrect from archive.

--HG--
extra : convert_revision : 689ef6a1573eff2551894b47d36b67b933b8e2ae
2003-10-10 11:10:36 -07:00
Steve Reinhardt
25693e9e69 Make include paths explicit and update makefile accordingly.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
arch/alpha/arguments.cc:
arch/alpha/arguments.hh:
arch/alpha/ev5.cc:
arch/alpha/ev5.hh:
arch/alpha/fake_syscall.cc:
arch/alpha/faults.cc:
arch/alpha/isa_desc:
arch/alpha/isa_traits.hh:
arch/alpha/osfpal.cc:
arch/alpha/vtophys.cc:
arch/alpha/vtophys.hh:
base/circlebuf.cc:
base/compression/lzss_compression.cc:
base/compression/lzss_compression.hh:
base/cprintf.cc:
base/cprintf.hh:
base/fast_alloc.cc:
base/fifo_buffer.cc:
base/fifo_buffer.hh:
base/hashmap.hh:
base/hostinfo.cc:
base/hostinfo.hh:
base/hybrid_pred.cc:
base/hybrid_pred.hh:
base/inet.cc:
base/inet.hh:
base/inifile.cc:
base/inifile.hh:
base/intmath.cc:
base/loader/aout_object.cc:
base/loader/aout_object.hh:
base/loader/ecoff_object.cc:
base/loader/ecoff_object.hh:
base/loader/elf_object.cc:
base/loader/elf_object.hh:
base/loader/exec_aout.h:
base/loader/exec_ecoff.h:
base/loader/object_file.cc:
base/loader/object_file.hh:
base/loader/symtab.cc:
base/loader/symtab.hh:
base/misc.cc:
base/misc.hh:
base/pollevent.cc:
base/pollevent.hh:
base/random.cc:
base/random.hh:
base/range.hh:
base/remote_gdb.cc:
base/remote_gdb.hh:
base/res_list.hh:
base/sat_counter.cc:
base/sat_counter.hh:
base/sched_list.hh:
base/socket.cc:
base/statistics.cc:
base/statistics.hh:
base/str.cc:
base/trace.cc:
base/trace.hh:
cpu/base_cpu.cc:
cpu/base_cpu.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/exetrace.cc:
cpu/exetrace.hh:
cpu/intr_control.cc:
cpu/intr_control.hh:
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
cpu/pc_event.cc:
cpu/pc_event.hh:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/static_inst.cc:
cpu/static_inst.hh:
dev/alpha_console.cc:
dev/alpha_console.hh:
dev/console.cc:
dev/console.hh:
dev/disk_image.cc:
dev/disk_image.hh:
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherdump.cc:
dev/etherdump.hh:
dev/etherint.cc:
dev/etherint.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/etherpkt.hh:
dev/ethertap.cc:
dev/ethertap.hh:
dev/simple_disk.cc:
dev/simple_disk.hh:
kern/tru64/tru64_syscalls.cc:
kern/tru64/tru64_syscalls.hh:
sim/debug.cc:
sim/eventq.cc:
sim/eventq.hh:
sim/main.cc:
sim/param.cc:
sim/param.hh:
sim/prog.cc:
sim/prog.hh:
sim/serialize.cc:
sim/serialize.hh:
sim/sim_events.cc:
sim/sim_events.hh:
sim/sim_object.cc:
sim/sim_object.hh:
sim/sim_time.cc:
sim/system.cc:
sim/system.hh:
sim/universe.cc:
test/circletest.cc:
test/cprintftest.cc:
test/initest.cc:
test/nmtest.cc:
test/offtest.cc:
test/paramtest.cc:
test/rangetest.cc:
test/stattest.cc:
test/strnumtest.cc:
test/symtest.cc:
test/tokentest.cc:
test/tracetest.cc:
util/tap/tap.cc:
    Make include paths explicit.

--HG--
extra : convert_revision : 941cbdc591fd4d3d1d9f095cd58fc23dd2d73840
2003-10-10 11:09:00 -07:00
Steve Reinhardt
52b31ea0a6 File moves for the reorg. Tree is in broken state until I commit the makefile and
#include changes.

--HG--
rename : sim/cache/lzss_compression.cc => base/compression/lzss_compression.cc
rename : sim/cache/lzss_compression.hh => base/compression/lzss_compression.hh
rename : sim/cache/null_compression.hh => base/compression/null_compression.hh
rename : sim/hybrid_pred.cc => base/hybrid_pred.cc
rename : sim/hybrid_pred.hh => base/hybrid_pred.hh
rename : base/aout_object.cc => base/loader/aout_object.cc
rename : base/aout_object.hh => base/loader/aout_object.hh
rename : base/coff_sym.h => base/loader/coff_sym.h
rename : base/coff_symconst.h => base/loader/coff_symconst.h
rename : base/ecoff_object.cc => base/loader/ecoff_object.cc
rename : base/ecoff_object.hh => base/loader/ecoff_object.hh
rename : base/elf_object.cc => base/loader/elf_object.cc
rename : base/elf_object.hh => base/loader/elf_object.hh
rename : base/exec_aout.h => base/loader/exec_aout.h
rename : base/exec_ecoff.h => base/loader/exec_ecoff.h
rename : base/object_file.cc => base/loader/object_file.cc
rename : base/object_file.hh => base/loader/object_file.hh
rename : base/symtab.cc => base/loader/symtab.cc
rename : base/symtab.hh => base/loader/symtab.hh
rename : sim/predictor.hh => base/predictor.hh
rename : sim/sat_counter.cc => base/sat_counter.cc
rename : sim/sat_counter.hh => base/sat_counter.hh
rename : sim/base_cpu.cc => cpu/base_cpu.cc
rename : sim/base_cpu.hh => cpu/base_cpu.hh
rename : sim/exec_context.cc => cpu/exec_context.cc
rename : sim/exec_context.hh => cpu/exec_context.hh
rename : sim/exetrace.cc => cpu/exetrace.cc
rename : sim/exetrace.hh => cpu/exetrace.hh
rename : sim/op_class.hh => cpu/full_cpu/op_class.hh
rename : sim/smt.hh => cpu/full_cpu/smt.hh
rename : sim/inst_seq.hh => cpu/inst_seq.hh
rename : sim/intr_control.cc => cpu/intr_control.cc
rename : sim/intr_control.hh => cpu/intr_control.hh
rename : sim/memtest.cc => cpu/memtest/memtest.cc
rename : sim/memtest.hh => cpu/memtest/memtest.hh
rename : sim/pc_event.cc => cpu/pc_event.cc
rename : sim/pc_event.hh => cpu/pc_event.hh
rename : sim/simple_cpu.cc => cpu/simple_cpu/simple_cpu.cc
rename : sim/simple_cpu.hh => cpu/simple_cpu/simple_cpu.hh
rename : sim/static_inst.cc => cpu/static_inst.cc
rename : sim/static_inst.hh => cpu/static_inst.hh
extra : convert_revision : 05bd41acb2a424f1a38609fd4ac6df681bb479d6
2003-10-10 09:57:26 -07:00
Nathan Binkert
9e7f6da141 makefile:
don't need -lpthread anymore

--HG--
extra : convert_revision : 00b4a929765ed9fc46a76f8c958d809ffe280401
2003-10-10 12:51:46 -04:00
Nathan Binkert
f722bf515c Remove a ton of old simplescalar crap that we no longer need.
sim/base_cpu.cc:
sim/exec_context.hh:
sim/hybrid_pred.cc:
sim/main.cc:
sim/prog.hh:
sim/sat_counter.cc:
sim/sim_object.cc:
sim/sim_object.hh:
sim/simple_cpu.cc:
    old stats begone!

--HG--
extra : convert_revision : b0173f13744466b6d9607797b57f7f9bc9bc769f
2003-10-10 10:38:28 -04:00
Nathan Binkert
f4e2b3fa77 Stop using omisc.h and move relevant functions to better places
while converting them to C++

base/intmath.hh:
    Add some functions that were previously defined elsewhere in C
base/misc.cc:
    Use the C++ version of memUsage, and sort #includes
sim/prog.cc:
    Stop using the old macro versions of various functions and use
    the new ones defined in intmath.hh
sim/sim_events.cc:
    Stop using the old C versions of various functions and use
    the new ones defined in hostinfo.hh

--HG--
extra : convert_revision : 15d1f24d2aff4254c745eea6070cb230dd37b8d2
2003-10-10 09:53:16 -04:00
Nathan Binkert
a2b619df6d Add cleandepend and depend as make targets
--HG--
extra : convert_revision : e18df5ae8374e39f926746e8999a3a04ffef62ff
2003-10-10 09:46:18 -04:00
Nathan Binkert
1092515e65 Rename intmath.h to intmath.hh
clean up the formatting
make things use templates since this is C++ now.

base/circlebuf.cc:
base/intmath.cc:
base/intmath.hh:
base/range.hh:
base/remote_gdb.cc:
base/statistics.cc:
base/str.cc:
    intmath.h -> intmath.hh
base/intmath.hh:
    Make this more like C++ by templatizing these functions

--HG--
rename : base/intmath.h => base/intmath.hh
extra : convert_revision : 8f9b14de9db751b1bd78588c51613d77afd96989
2003-10-10 09:44:49 -04:00
Erik Hallnor
62c4d82600 Added new tag in use stat.
--HG--
extra : convert_revision : 10316d7714818f46249179614fa45ad90391760e
2003-10-10 00:24:14 -04:00
Ron Dreslinski
a4b43dd23e Cleanup, initalize some variables properly and remove unused variables
--HG--
extra : convert_revision : e7db52821b4305ff8305307e65063614ae1201f7
2003-10-09 18:24:40 -04:00
Erik Hallnor
ab85cbb10c Lets really remove it.
--HG--
extra : convert_revision : a8aecf60a624df515c7af5988666c48a1a3d9505
2003-10-09 17:02:12 -04:00
Erik Hallnor
1660e3cd0f Remove Attic from build directory since it is ignored anyway
--HG--
extra : convert_revision : fd39c91a251746037fb70f8be11c0d37808b1691
2003-10-09 17:00:51 -04:00
Erik Hallnor
ea13ce1f42 Rename COPY_IN_SERVICE
--HG--
extra : convert_revision : 530715d1a6496a86bf141a5878f1c0d187c0d026
2003-10-09 16:58:19 -04:00
Erik Hallnor
b6841ad2bd Add a Blocking cache implementation. Used when 1 MSHR is specified, or when the master bus is in non event mode.
--HG--
extra : convert_revision : 88b2304fd9e296c6eb17838382ad99de4d4f90dc
2003-10-09 16:56:48 -04:00
Erik Hallnor
ed58b920da Add blocking buffer class. Still need to instantiate it.
--HG--
extra : convert_revision : 86cde2cd83d94610d9ffaff4f4bded2d867ad138
2003-10-09 13:33:07 -04:00
Erik Hallnor
a4cfcb911a Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 63ca038244266df51811b71c97be1a24d8636951
2003-10-09 11:51:10 -04:00
Erik Hallnor
ea2db23eaa file-moves:
Add blocking_buffer.cc/hh to file-moves

--HG--
extra : convert_revision : 695b602361888fa1dd597ccc735edd61b2c325a2
2003-10-09 11:51:02 -04:00
Steve Reinhardt
6fc67b63c8 Finish explicit-includes.pl script.
--HG--
extra : convert_revision : 92088c5e10108562d18f142e106590fe03363d97
2003-10-09 08:03:34 -07:00
Steve Reinhardt
878f27ca65 First cut at scripts to process file-moves.
--HG--
extra : convert_revision : c677031aa957867edc49bcc31503ac8edbcb8b0b
2003-10-09 06:58:03 -07:00
Steve Reinhardt
6f406fe2f2 Another pass on file-moves.
--HG--
extra : convert_revision : 78d940ab0a668f30e42239f725a42e1722b80c1c
2003-10-08 22:37:04 -07:00
Steve Reinhardt
a56b6caca9 Rename std_types.hh to the much more descriptive inst_seq.hh
base/res_list.hh:
    Don't need to include std_types.hh
sim/exetrace.hh:
    Rename std_types.hh to inst_seq.hh

--HG--
rename : sim/std_types.hh => sim/inst_seq.hh
extra : convert_revision : 23698c9a83f1c19a6df8fa6f266ff4d8949a6cd9
2003-10-08 22:29:27 -07:00
Steve Reinhardt
34af922d76 Really only need one set of fifo_buffer.hh,cc files (not two!). Merge the best of both.
base/fifo_buffer.cc:
base/fifo_buffer.hh:
    style

--HG--
extra : convert_revision : 829a36362dd8ba9ae92ca5e3f7381eb5b300c964
2003-10-08 22:12:01 -07:00
Steve Reinhardt
ee3b92235f Delete some more unneeded files.
--HG--
extra : convert_revision : 1671391b9a7783196eabfdbd85ef9f46d40b56e9
2003-10-08 22:04:59 -07:00
Steve Reinhardt
9fe21a16b0 Get rid of a couple more obsolete loader files.
--HG--
extra : convert_revision : 8f2caad5b5cbcb1ca46d139788dcf8c5e77f5950
2003-10-08 21:19:36 -07:00
Steve Reinhardt
3ff240473c Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : c74ab2e50ca5fa739c3ca1baabeb50df7f2368d7
2003-10-08 21:08:37 -07:00
Steve Raasch
a5366f9683 testing behavior of decoder.cc file
arch/alpha/alpha_memory.cc:
    append a blank line

--HG--
extra : convert_revision : 482388741a3000b0c745733c9882300ff9ecf529
2003-10-08 23:09:50 -04:00
Erik Hallnor
f7038ed61e Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 459fc18d099c7e8e1e062cdc02dcc38ff3852071
2003-10-08 19:10:19 -04:00
Erik Hallnor
4be70d8ae6 file-moves:
Memory hierarchy again
.psrc:
Don't know why this comes up as changed

--HG--
extra : convert_revision : ec98a475dcddc1ee552fe93b6c8210a3dc654f11
2003-10-08 19:08:48 -04:00
Steve Raasch
f25060fc3b testing check-in after fixing file ownership in root repo
--HG--
extra : convert_revision : 56b38fea82c96ca41eb4e4e77dfb7804f4f964d5
2003-10-08 19:06:01 -04:00