Commit graph

8859 commits

Author SHA1 Message Date
Erik Hallnor
11eaf2f2ab Remove conflicts
--HG--
extra : convert_revision : c680884d3e758fab5ce3a258ec277f1a22f87ea1
2003-10-15 17:17:19 -04:00
Erik Hallnor
4159dc218a Add a stat to track the cycle when the cache has all blocks touched (if ever).
--HG--
extra : convert_revision : 5bc15c55eddd58336625997817f583e0d43225c6
2003-10-15 17:11:46 -04:00
Nathan Binkert
f96032235e Fix the default target for the makefile
--HG--
extra : convert_revision : 32f2018fbe761121a848f0a7a980523514fc7710
2003-10-15 16:42:53 -04:00
Nathan Binkert
8dd080032b Global whitespace fixes
Mainly removing whitespace at the end of lines.
This will reduce future diffs/conflicts.
Also adding a space after if, while, and for

This was all accomplished with:
#!/usr/bin/perl -pi~
s/[ 	]+$//;           # there is a space and a tab in the brackets
s/if\(/if (/g;
s/for\(/for (/g;
s/while\(/while (/g;

arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
arch/alpha/arguments.hh:
arch/alpha/ev5.cc:
arch/alpha/fake_syscall.cc:
arch/alpha/isa_traits.hh:
arch/alpha/vtophys.cc:
base/cprintf.cc:
base/cprintf.hh:
base/cprintf_formats.hh:
base/dbl_list.hh:
base/fast_alloc.cc:
base/fast_alloc.hh:
base/hybrid_pred.cc:
base/hybrid_pred.hh:
base/inet.cc:
base/inifile.cc:
base/intmath.cc:
base/intmath.hh:
base/misc.cc:
base/mod_num.hh:
base/pollevent.cc:
base/random.cc:
base/random.hh:
base/range.hh:
base/refcnt.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/compression/lzss_compression.cc:
base/compression/lzss_compression.hh:
base/compression/null_compression.hh:
base/loader/coff_sym.h:
base/loader/coff_symconst.h:
base/loader/ecoff_object.cc:
base/loader/object_file.cc:
base/loader/object_file.hh:
base/loader/symtab.cc:
base/loader/symtab.hh:
base/socket.cc:
base/statistics.cc:
base/statistics.hh:
base/str.cc:
base/str.hh:
base/trace.cc:
base/trace.hh:
cpu/base_cpu.cc:
cpu/base_cpu.hh:
cpu/exec_context.hh:
cpu/exetrace.cc:
cpu/intr_control.hh:
cpu/pc_event.cc:
cpu/pc_event.hh:
cpu/static_inst.hh:
cpu/full_cpu/op_class.hh:
cpu/full_cpu/smt.hh:
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
dev/alpha_access.h:
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/etherdump.cc:
dev/etherint.cc:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/pcireg.h:
docs/stl.hh:
kern/tru64/dump_mbuf.cc:
kern/tru64/printf.cc:
kern/tru64/tru64_events.cc:
kern/tru64/tru64_system.cc:
kern/tru64/tru64_system.hh:
sim/debug.cc:
sim/eventq.cc:
sim/eventq.hh:
sim/host.hh:
sim/main.cc:
sim/param.cc:
sim/param.hh:
sim/prog.cc:
sim/serialize.cc:
sim/serialize.hh:
sim/sim_events.cc:
sim/sim_object.cc:
sim/sim_time.cc:
sim/sim_time.hh:
sim/system.cc:
test/bitvectest.cc:
test/circletest.cc:
test/initest.cc:
test/lru_test.cc:
test/nmtest.cc:
test/offtest.cc:
test/sized_test.cc:
test/stattest.cc:
test/symtest.cc:
util/tap/tap.cc:
util/term/term.c:
    formatting fixes

--HG--
extra : convert_revision : 01e6dbc9615c5d0e923502b8410a416c0434cdf6
2003-10-15 16:39:37 -04:00
Nathan Binkert
1e71e6b748 Fix up the targetarch target so that things build a little
better.  This changes how the setup script works, but
you don't need to re-run setup.

--HG--
extra : convert_revision : 764d7440561d0ee73f554d45a4ef8533fd35734b
2003-10-15 16:22:50 -04:00
Nathan Binkert
722f9bc3c8 Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : d5ba96b559be93774e82692099675b6d1f525221
2003-10-14 18:04:28 -04:00
Nathan Binkert
f8d850195b try to get everything to compile correctly again
base/intmath.hh:
    Don't return -1 in FloorLog2.  That's wierd.  Assert instead.
    If you care about this, you should check for zero yourself.
    Create seprate versions for uint32_t, uint64_t, int32_t, and
    int64_t.  signed vs unsigned so that error checking can be done
    correctly.  32 vs 64 for speed.
    Finally, fix a little bug in CeilLog2 that will make it return
    the correct result for 1.
kern/tru64/tru64_events.cc:
    fix #includes

--HG--
extra : convert_revision : c47915fc417fdc194a5561949a5366ffb266e693
2003-10-14 18:04:20 -04:00
Steve Raasch
acf025a463 Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/y/sraasch/m5

--HG--
extra : convert_revision : 022364d1e5bf2f3b004ba75164580c1a821b16a5
2003-10-14 17:06:05 -04:00
Steve Raasch
8be145a42f Fixes for the new stats in SegmentedIQ
base/statistics.hh:
    Put a commented-out #define for STAT_DEBUG

--HG--
extra : convert_revision : 7c2decc9dac7c3c9d867461d2e0f1970f3ca0733
2003-10-14 17:05:42 -04:00
Nathan Binkert
638a07d15a Merge
cpu/pc_event.cc:
    SCCS merged

--HG--
extra : convert_revision : f7046f2bf6053be9b00150390fabe3d4f82b0981
2003-10-14 16:53:52 -04:00
Erik Hallnor
2ac3dc5aa1 Fix to test change. Will update tests once KERNEL compiles again. The only
test change that is real is SIM:cycle is now gone.

--HG--
extra : convert_revision : 7b5c25c35c11eb44e10e9c49324a93c8ed3e12bb
2003-10-14 15:01:28 -04:00
Erik Hallnor
7755f825d4 Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 25b46c6ff1be6ea339dcaccce2f2987e4ea0f484
2003-10-14 13:29:20 -04:00
Erik Hallnor
118f5da7f8 hostinfo.cc:
Trial fix, uint64_T > long

base/hostinfo.cc:
    Trial fix, uint64_T > long

--HG--
extra : convert_revision : cc039420980f1bf29074a20ccea3b9a3afe99f22
2003-10-14 13:29:12 -04:00
Steve Reinhardt
9d51e99865 Use common trigger script for email.
--HG--
extra : convert_revision : fa5537304bd5e574807df5954f166ce884bb45d5
2003-10-14 12:55:49 -04:00
Nathan Binkert
4759c203c7 Remove all of the Tru64 specific stuff from the base System object
into its own Tru64System object.  Also remove the System builder
stuff and create a Tru64System builder.  This makes it much
simpler to support more operating systems.

arch/alpha/ev5.cc:
    Each system provides its own mechanism for doing a breakpoint.
base/remote_gdb.hh:
    #include <map>
cpu/pc_event.cc:
cpu/pc_event.hh:
    Separate out System specific PCEvents
cpu/simple_cpu/simple_cpu.cc:
    each system provides its own init script
kern/tru64/dump_mbuf.cc:
kern/tru64/printf.cc:
    Stick this in a namespace

--HG--
extra : convert_revision : 9f74527ed2ff8010431d9aff34357aaecc1fb3f6
2003-10-14 12:19:59 -04:00
Steve Reinhardt
459fe3f094 config:
Make /m5/latest read-only as well.

--HG--
extra : convert_revision : 3b6fc63dfe32e564d77f428dad90d7467af0e67f
2003-10-14 11:37:30 -04:00
Nathan Binkert
8296fae15b small fixes
base/hostinfo.cc:
    Since we're talking about a u_int64, use %lld.
    Maybe this should be converted using toNumber in the future.

--HG--
extra : convert_revision : f2ae97585d3009c380553313129dfdd212d6716b
2003-10-14 08:57:54 -04:00
Steve Reinhardt
1a12f365e0 Fix trigger-happy triggers.
--HG--
extra : convert_revision : 6b562514124f81aada18272a4b5d7ac53bb6bd7a
2003-10-14 01:47:40 -04:00
Steve Reinhardt
fd55a1cbbb generic:
Only run on incoming pushes

--HG--
extra : convert_revision : bd2ecfbd1048432c17b0a87ca371a739a833b934
2003-10-14 01:36:59 -04:00
Steve Reinhardt
ea8fa86e10 Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : 097e1f2a0ba706dd65ecbaf0e2047a04e916e5d1
2003-10-13 22:22:20 -07:00
Steve Reinhardt
e6e1c27343 Fix for cpu.cc -> full_cpu.cc rename.
--HG--
extra : convert_revision : 2404b91b9c7f0185af13d43b2b8155c1b75d4062
2003-10-13 22:21:49 -07:00
Steve Reinhardt
af5cdc1d8c Rename CPU object to FullCPU
arch/alpha/isa_desc:
arch/alpha/isa_traits.hh:
cpu/static_inst.hh:
    CPU -> FullCPU

--HG--
extra : convert_revision : 2bed1ed9372ca9e33f7e391a1aa47bbc02675691
2003-10-13 22:21:19 -07:00
Erik Hallnor
af35f423ba Since I seem to be bug compatible with the head I'm going to commit.
There is still one documentation warning in the stat code, probably a
doxygen error.

base/statistics.cc:
    Added documentation to SubData and StatData.
base/statistics.hh:
    Documented most of the basic stats (storage, implemenation) and all of the
    visible stats. There is more to be documented, but I'm going crazy now.

    Also fixed the DistStor::zero() function to meet the semantics of the other ones.

--HG--
extra : convert_revision : f80b3075a3298cbded059be8125b7fc7b77020a9
2003-10-14 01:20:26 -04:00
Steve Reinhardt
35e5d907c4 Update generated files. We need to fix the permissions issues here.
--HG--
extra : convert_revision : d04fe428088c986c993cfd39ff9852f16aee8f99
2003-10-13 21:55:43 -07:00
Steve Reinhardt
00f8ea4576 Another case where we need to fix an include path for a generated file in the script that generates it.
--HG--
extra : convert_revision : 85d399aa6acb7a200b9bdce42a5fdecbd88d6ef0
2003-10-13 21:52:42 -07:00
Steve Reinhardt
75e5460579 Rename full_cpu/cpu.cc,hh to full_cpu.cc,hh.
arch/alpha/isa_desc:
    Fix include: cpu.hh renamed to full_cpu.hh
cpu/pc_event.cc:
    Didn't need cpu.hh, just base_cpu.hh.
sim/sim_events.cc:
    Didn't need cpu.hh, just param.hh.

--HG--
extra : convert_revision : 2e3fd36476c639af950ba2113f67e8ea24c22be8
2003-10-13 21:51:34 -07:00
Steve Reinhardt
1348e57ac1 Fix up decoder.cc generation... this got broken at the directory reorg.
arch/isa_parser.py:
    Fix include path (bitfield.hh -> base/bitfield.hh).

--HG--
extra : convert_revision : 2ce02d0a5986694a6a6ebcab1e5e0a306d6e5a49
2003-10-13 21:47:27 -07:00
Steve Reinhardt
4dbe897b15 Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : 2652475597b88075ec3531c1f2e3c866654f9b05
2003-10-13 21:00:52 -07:00
Steve Reinhardt
551e67d3d6 Read-only checkout in root repository.
--HG--
extra : convert_revision : be9af2d9a4c8e7d6f1a025307b08c58105018cd6
2003-10-13 23:52:57 -04:00
Steve Reinhardt
a246f5d757 Commit trigger files
--HG--
extra : convert_revision : 4c8cdcb4a11f038221e2e9693ffb1ee4c386d30f
2003-10-13 23:29:46 -04:00
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