gem5.git
21 years agoMore tweaking of find-files script. FYI, I now have this hard-wired
Steve Reinhardt [Sun, 26 Oct 2003 16:21:11 +0000 (08:21 -0800)]
More tweaking of find-files script.  FYI, I now have this hard-wired
into my 'grc' command under emacs.

--HG--
extra : convert_revision : dad50adde069a2218059e628a986fced39b2123e

21 years agoInitialize startTick to 1 instead of 0. Fixes floss-check failure
Steve Reinhardt [Sun, 26 Oct 2003 16:18:59 +0000 (08:18 -0800)]
Initialize startTick to 1 instead of 0.  Fixes floss-check failure
in debug mode.

--HG--
extra : convert_revision : b37d057e3fdb4d8556b7aa61126fb47a5a3d9edf

21 years agoMerge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
Steve Reinhardt [Sun, 26 Oct 2003 04:19:54 +0000 (21:19 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : b5f54dc24f6219426317c9d5cac3351de6b1a1bf

21 years agoMerge isabel.reinhardt.house:/z/stever/bk/m5
Steve Reinhardt [Sun, 26 Oct 2003 04:19:14 +0000 (21:19 -0700)]
Merge isabel.reinhardt.house:/z/stever/bk/m5
into isabel.reinhardt.house:/z/stever/bk2/m5

--HG--
extra : convert_revision : 84e69c15047423e683478dde1171a2c6348143fa

21 years agoNew rundiff script.
Steve Reinhardt [Sun, 26 Oct 2003 03:49:08 +0000 (20:49 -0700)]
New rundiff script.

util/rundiff:
    Completely rewritten from scratch.  Can work standalone (with simple built-in
    diff algorithm) or use Algorithm::Diff package for better (but slower) diffs.

--HG--
extra : convert_revision : bb66d937e92bfd1904bd259589bacb5eff404c02

21 years agoFix packet buffer management for receive packets
Nathan Binkert [Sat, 25 Oct 2003 22:23:19 +0000 (18:23 -0400)]
Fix packet buffer management for receive packets

dev/etherlink.cc:
    DPRINTF before the packet is sent to the other interface to
    make the output a little more understandable

--HG--
extra : convert_revision : 9c7dd5dd6dbbbc416db70a52228e918af2e76d96

21 years agoAdd the directory where the ini file was found into the #include
Nathan Binkert [Sat, 25 Oct 2003 22:19:32 +0000 (18:19 -0400)]
Add the directory where the ini file was found into the #include
search path

--HG--
extra : convert_revision : 9a6bceb931613b718bf5a561b354ba9ccb847a78

21 years agoDon't schedule tickEvent if it's already been scheduled.
Steve Reinhardt [Sat, 25 Oct 2003 07:47:51 +0000 (00:47 -0700)]
Don't schedule tickEvent if it's already been scheduled.

--HG--
extra : convert_revision : 9cdfeb4df661b25fc000e35c1f34ee11cec6a668

21 years agoMerge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
Steve Reinhardt [Sat, 25 Oct 2003 06:37:28 +0000 (23:37 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : 921d26b6fe29870fa532394b388bc0fe6cac183e

21 years agoMake util/find-files work from anywhere in the source tree (assuming you
Steve Reinhardt [Sat, 25 Oct 2003 06:22:35 +0000 (23:22 -0700)]
Make util/find-files work from anywhere in the source tree (assuming you
name the root of your tree 'm5').

--HG--
extra : convert_revision : 1315c2864cbed941576d20e2fe895551992570a0

21 years agoMove some common full-system CPU initialization from the
Steve Reinhardt [Sat, 25 Oct 2003 06:20:27 +0000 (23:20 -0700)]
Move some common full-system CPU initialization from the
SimpleCPU & FullCPU constructors to AlphaISA::initCPU().

cpu/simple_cpu/simple_cpu.cc:
    Move some common full-system CPU initialization from the
    SimpleCPU & FullCPU constructors to AlphaISA::initCPU().
    Make 'fault' local to SimpleCPU::tick.
cpu/simple_cpu/simple_cpu.hh:
    Make 'fault' local to SimpleCPU::tick (not an object member).

--HG--
extra : convert_revision : e878dedfff06aac0548aca8b14d66c18b8916895

21 years agoMake FullCPU schedule its TickEvent when one of its contexts becomes active.
Steve Reinhardt [Sat, 25 Oct 2003 06:02:36 +0000 (23:02 -0700)]
Make FullCPU schedule its TickEvent when one of its contexts becomes active.
This fixes detailed-mpboot, which was broken as of my last change.
Also clean up some of the ExecContext status initialization.

cpu/base_cpu.hh:
    CPU::execCtxStatusChg() now takes thread_num as an arg so the CPU knows
    which execContext had the status change.
    BaseCPU::registerExecContexts() no longer needs to be virtual.
cpu/exec_context.cc:
    Initialize _status directly... don't use setStatus() as this will notify the CPU
    of the change before it is ready.
    CPU::execCtxStatusChg() now takes thread_num as an arg so the CPU knows
    which execContext had the status change.
cpu/exec_context.hh:
    Don't need initStatus() any more.
cpu/simple_cpu/simple_cpu.cc:
    Move execCtxStatusChg() from header to .cc file.
    No longer need specialized version of registerExecContexts to schedule TickEvent.
cpu/simple_cpu/simple_cpu.hh:
    Move execCtxStatusChg() from header to .cc file.
    CPU::execCtxStatusChg() now takes thread_num as arg (must be 0 for SimpleCPU).
    No longer need specialized version of registerExecContexts to schedule TickEvent.
kern/tru64/tru64_system.cc:
    Don't need initRegs; the PC etc. get initialized in the CPU constructor.
    ExecContexts start out as Unallocated, so no need to set them to Unallocated here.
kern/tru64/tru64_system.hh:
    Don't need initRegs; the PC etc. get initialized in the CPU constructor.
sim/prog.cc:
    ExecContexts start out as Unallocated, so no need to set them to Unallocated here.

--HG--
extra : convert_revision : e960ebbeb845960344633798e251b6c8bf1c0378

21 years agoAdded m5func "resetstats" to allow scriptable reset of statistics inside sim
Andrew Schultz [Fri, 24 Oct 2003 20:28:04 +0000 (16:28 -0400)]
Added m5func "resetstats" to allow scriptable reset of statistics inside sim

--HG--
extra : convert_revision : 35a93fe085c2ca7ca1fc8bf887539e0b9c704aaf

21 years agoAdded new ini file for specwebssl
Andrew Schultz [Fri, 24 Oct 2003 18:57:24 +0000 (14:57 -0400)]
Added new ini file for specwebssl

--HG--
extra : convert_revision : df7fa6244f9a5a0660c9b5b30974b8544d12edcd

21 years agoA few minor fixes to sampling... seems to work now for the base case
Steve Reinhardt [Fri, 24 Oct 2003 04:52:46 +0000 (21:52 -0700)]
A few minor fixes to sampling... seems to work now for the base case
of two CPUs and one switch-over event.  Still some stats glitches though.

cpu/simple_cpu/simple_cpu.cc:
    Schedule switched-to CPU right on curTick so we don't lose a cycle.
    Remember to switch out old CPU.

--HG--
extra : convert_revision : f1bf21cac054c74f59770d8b20b30118f46be6f1

21 years agoMerge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
Steve Reinhardt [Fri, 24 Oct 2003 02:09:18 +0000 (19:09 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : b0f93bd35d767fd3a520a9fed70a71d40b0056db

21 years agoIf things go really wrong, panic() instead of fatal() so gdb gets control.
Steve Reinhardt [Fri, 24 Oct 2003 02:09:02 +0000 (19:09 -0700)]
If things go really wrong, panic() instead of fatal() so gdb gets control.

--HG--
extra : convert_revision : 40fddc2da0bca98542db0e97fa91092497977d2b

21 years agoInitial support for CPU switching. New SamplingCPU object encompasses a set
Steve Reinhardt [Fri, 24 Oct 2003 02:07:52 +0000 (19:07 -0700)]
Initial support for CPU switching.  New SamplingCPU object encompasses a set
of CPUs that get switched round-robin (though currently we're only shooting for
two CPUs and one switch event, and even that doesn't quite work yet).  Registration
of ExecContexts with System/Process object factored out so we can create two CPUs
but only register one of them at a time.  Also worked at making behavior and naming
in System and Process objects more consistent.

arch/alpha/ev5.cc:
    Rename ipr_init to initIPRs and get rid of unused mem arg.
arch/alpha/fake_syscall.cc:
    Process:numCpus is now a function (not a data member).
base/remote_gdb.hh:
    Support for ExecContext switching.
cpu/base_cpu.cc:
cpu/base_cpu.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.hh:
    Support for ExecContext switching.
    Renamed contexts array to execContexts to be consistent with Process.
    CPU ID now auto-assigned by system object.
cpu/simple_cpu/simple_cpu.cc:
    Support for ExecContext switching.
    Renamed contexts array to execContexts to be consistent with Process.
    CPU ID now auto-assigned by system object.
    Cleaned up MP full-system initialization a bit.
dev/alpha_console.cc:
    Renamed xcvec array to execContexts to be consistent with Process.
kern/tru64/tru64_system.cc:
kern/tru64/tru64_system.hh:
    Support for ExecContext switching.
    CPU ID now auto-assigned by system object.
sim/prog.cc:
sim/prog.hh:
    Support for ExecContext switching.
    Process:numCpus is now a function (not a data member).
sim/system.cc:
sim/system.hh:
    Support for ExecContext switching.
    Renamed xcvec array to execContexts to be consistent with Process.

--HG--
extra : convert_revision : 79649cffad5bf3e83de8df44236941907926d791

21 years agoMinor stats fix.
Steve Reinhardt [Fri, 24 Oct 2003 01:53:16 +0000 (18:53 -0700)]
Minor stats fix.

base/statistics.cc:
    Small fix: don't exit early out of dist when nozero is set and a zero val is found.

--HG--
extra : convert_revision : 95ba3328c8a79f05f4c821d99071dba10f013ad6

21 years agoPrint error message when we can't parse a .ini assignment line.
Steve Reinhardt [Fri, 24 Oct 2003 01:51:12 +0000 (18:51 -0700)]
Print error message when we can't parse a .ini assignment line.

--HG--
extra : convert_revision : b7e19ff42ddd9a21571e086c11e143d9290e0e38

21 years agoMove to non-architecture specific MemReq
Erik Hallnor [Thu, 23 Oct 2003 20:40:08 +0000 (16:40 -0400)]
Move to non-architecture specific MemReq

arch/alpha/alpha_memory.hh:
cpu/exec_context.hh:
cpu/pc_event.hh:
    Move to non architecture specific MemReq

--HG--
extra : convert_revision : 2445943b6f1c8af86b90cfa9c2f9b1eb4a6a1aa2

21 years agoNew kernel-specweb.ini file for the new specweb99 setup.
Andrew Schultz [Thu, 23 Oct 2003 19:54:01 +0000 (15:54 -0400)]
New kernel-specweb.ini file for the new specweb99 setup.

--HG--
extra : convert_revision : 8f2bf5ee56ba4fc7484e6510acd3cb93a17174d3

21 years agoChanged the init_param to a uint64_t from int
Andrew Schultz [Wed, 22 Oct 2003 22:50:54 +0000 (18:50 -0400)]
Changed the init_param to a uint64_t from int

--HG--
extra : convert_revision : fbd3d3bbaa539661f63e4f7991b0a6275992d60a

21 years agoMerge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
Steve Reinhardt [Wed, 22 Oct 2003 14:10:34 +0000 (07:10 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : db4330ff1258261d8a07fee2cc0e813839fbb9d6

21 years agoCanonicalize bus name capitalization: bus to Foo is toFooBus.
Steve Reinhardt [Wed, 22 Oct 2003 14:10:12 +0000 (07:10 -0700)]
Canonicalize bus name capitalization: bus to Foo is toFooBus.

--HG--
extra : convert_revision : 27ccea6f1aaf84779fa172ae2e5fa1747957e35c

21 years agostatistics.cc:
Lisa Hsu [Wed, 22 Oct 2003 13:45:39 +0000 (09:45 -0400)]
statistics.cc:
change printf to be printed only when something is binned so regression doesn't freak out.

base/statistics.cc:
    change printf to be printed only when something is binned so regression doesn't freak out.

--HG--
extra : convert_revision : cb60128fc3ab605aa7e915c7c7512cf93b156c96

21 years agoMerge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
Lisa Hsu [Wed, 22 Oct 2003 06:02:12 +0000 (02:02 -0400)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5

--HG--
extra : convert_revision : ac1087a763d62291ffe9858b10c8af82123a1826

21 years agostatistics.hh:
Lisa Hsu [Wed, 22 Oct 2003 06:02:00 +0000 (02:02 -0400)]
statistics.hh:
forgot to doxygen comment binned()

base/statistics.hh:
    forgot to doxygen comment binned()

--HG--
extra : convert_revision : 7e414a3291e49b7b92bcbfec18470c3ec8671a35

21 years agoMerge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
Steve Reinhardt [Wed, 22 Oct 2003 05:39:08 +0000 (22:39 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : 64dca52045cab9a08aec2d4d18e9e9dad4ebaa89

21 years agoSimilar refactoring of SimpleCPU-based .ini files.
Steve Reinhardt [Wed, 22 Oct 2003 05:38:40 +0000 (22:38 -0700)]
Similar refactoring of SimpleCPU-based .ini files.
Add simple-events.ini for busses w/do_events=true, as this is all that seems to work at this point.

--HG--
extra : convert_revision : 0c5e64488b8f5860e39fa14b443b6c9bcd16c8bf

21 years agoMerge ehallnor@zizzer:/bk/m5
Erik Hallnor [Wed, 22 Oct 2003 05:18:35 +0000 (01:18 -0400)]
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 29cabd1c72f81ec89db5556ff9cf0128fe8af034

21 years agobus.cc:
Erik Hallnor [Wed, 22 Oct 2003 05:18:27 +0000 (01:18 -0400)]
bus.cc:
Update an assert to reflect the current state of the hierarchy

--HG--
extra : convert_revision : 33ddb05121c7614d12dcbf4b64fc6a8f4b97b0a3

21 years agoRestructure uni-*.ini configs as a single base config (uni-hier.ini)
Steve Reinhardt [Wed, 22 Oct 2003 05:07:21 +0000 (22:07 -0700)]
Restructure uni-*.ini configs as a single base config (uni-hier.ini)
with a bunch of variants that include this and then just do deltas.
Note how much shorter the files are!  It's much easier to see what's going on,
too.  For example, is it intentional that uni-hier-compressed does not set
do_data on the L2 (though it does on the L1 & L3)?
Also got rid of a couple of old broken ones (uni-default and uni-perfect-L2).

--HG--
extra : convert_revision : 70a12c06a8deb9b1c59def313b48f69ab62efce2

21 years agoMerge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
Lisa Hsu [Wed, 22 Oct 2003 05:05:00 +0000 (01:05 -0400)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5

--HG--
extra : convert_revision : 8658302b64207390b03f9fe133ad722a1417e022

21 years agoMerge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
Steve Reinhardt [Wed, 22 Oct 2003 04:33:34 +0000 (21:33 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : 070e7eadc64a104c9b176f911b0f05ab999deb47

21 years agoDon't need to include sim/param.hh in sim_object.hh anymore.
Steve Reinhardt [Wed, 22 Oct 2003 04:32:15 +0000 (21:32 -0700)]
Don't need to include sim/param.hh in sim_object.hh anymore.
Add explicit include of sim/param.hh to .cc files as needed.

cpu/base_cpu.cc:
cpu/exetrace.cc:
dev/etherint.cc:
sim/system.cc:
    Add include of sim/param.hh.
sim/sim_object.hh:
    Don't need to include sim/param.hh.

--HG--
extra : convert_revision : 8ed13f25c2087680230056ab7abb623e6a7699cf

21 years agoAutomerge
Lisa Hsu [Wed, 22 Oct 2003 04:30:04 +0000 (00:30 -0400)]
Automerge

--HG--
extra : convert_revision : d14536880d6f55d4304c0bab1fa08a5121bd1846

21 years agonate's reset stuff merged with my work on bin printing.
Lisa Hsu [Wed, 22 Oct 2003 04:29:45 +0000 (00:29 -0400)]
nate's reset stuff merged with my work on bin printing.

--HG--
extra : convert_revision : 438c94c90bfb3caffec461ad2c14b266cdf61494

21 years agoNew ini-file feature: += appends RHS to LHS.
Steve Reinhardt [Wed, 22 Oct 2003 04:24:34 +0000 (21:24 -0700)]
New ini-file feature: += appends RHS to LHS.
Added doxygen comments to inifile.hh.
Updated initest.  Some other minor cleanup.

base/inifile.cc:
    Add support for '+=' append operation.
    Factor common code from IniFile::load() and IniFile::add() into new Section::add().
    Rename ConfigTable to SectionTable (more descriptive).
    Fix bug in Section::dump().
base/inifile.hh:
    Add doxygen comments.
    Add support for '+=' append operation.
    Factor common code from IniFile::load() and IniFile::add() into new Section::add().
    Rename ConfigTable to SectionTable (more descriptive).
test/Makefile:
    initest needs cprintf.o now.
test/foo.ini:
    Add test of '+=' operator.
test/initest.cc:
    Bring this up-to-date.  Steal main loop from main.cc so we can test
    multiple .ini files and command-line assignments too.

--HG--
extra : convert_revision : 982521677fbf464e93aa93798ff7d9611826f17c

21 years agoMerge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
Erik Hallnor [Wed, 22 Oct 2003 04:23:24 +0000 (00:23 -0400)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5

--HG--
extra : convert_revision : c703dff6f52bd994f95597d824997adb125d3194

21 years agoProbe is now in. You currently can't probe uncacheable (of course it doesn't make...
Erik Hallnor [Wed, 22 Oct 2003 04:22:25 +0000 (00:22 -0400)]
Probe is now in. You currently can't probe uncacheable (of course it doesn't make much sense either.
Also, probe doesn't currently support compressed data, but will as soon as I encapsulate the calls more.

cpu/memtest/memtest.cc:
    Change memtest to not do probes on uncacheables.

--HG--
extra : convert_revision : 28ca4f793562e55da75e8b7fc3852bb5b1328ea9

21 years agostatistics.hh:
Lisa Hsu [Wed, 22 Oct 2003 03:56:31 +0000 (23:56 -0400)]
statistics.hh:
same - bin printing
statistics.cc:
printing of bins!  now all the nice binning functionality is actually useful cuz you can see the data it so nicely took.  this prints out only the individual bin values.  totals to come.
statistics.hh:
add a binned() function to each stat so that at print time, we can know if it's binned in order to print it right.

base/statistics.hh:
    add a binned() function to each stat so that at print time, we can know if it's binned in order to print it right.
base/statistics.cc:
    printing of bins!  now all the nice binning functionality is actually useful cuz you can see the data it so nicely took.  this prints out only the individual bin values.  totals to come.
base/statistics.hh:
    same - bin printing

--HG--
extra : convert_revision : 09df9aae62b0e522230ee6bedcb51079346735a4

21 years agoMerge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean
Lisa Hsu [Wed, 22 Oct 2003 03:18:07 +0000 (23:18 -0400)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean

--HG--
extra : convert_revision : 112a99bde10ea9c56f2390389dd13c024e298331

21 years agostatistics.hh:
Lisa Hsu [Wed, 22 Oct 2003 03:17:55 +0000 (23:17 -0400)]
statistics.hh:
fix up some very ambiguous doxygen comments about Formulas

base/statistics.hh:
    fix up some very ambiguous comments about Formulas

--HG--
extra : convert_revision : ad8d9579fd1933397590c78111bec7c0d19b0e14

21 years agoSince we don't hand off writebacks anymore, need to actually copy the request when...
Erik Hallnor [Wed, 22 Oct 2003 01:04:22 +0000 (21:04 -0400)]
Since we don't hand off writebacks anymore, need to actually copy the request when buffering it.

--HG--
extra : convert_revision : f4b7fbd6b8eb3715cac9c7ac41e95b588951ffc4

21 years agoI'll fix this screwup with the next change set
Erik Hallnor [Tue, 21 Oct 2003 23:22:09 +0000 (19:22 -0400)]
I'll fix this screwup with the next change set

--HG--
extra : convert_revision : 4e1cef3aa3f3fbcfb59089298436face195b713f

21 years agomem_debug.hh:
Erik Hallnor [Tue, 21 Oct 2003 23:19:37 +0000 (19:19 -0400)]
mem_debug.hh:
Add debug callout for cache probes.
miss_queue.hh, miss_queue.cc, blocking_buffer.hh:
Add support for snooping the write buffer.
cache.cc:
Snoop the Write buffer for writebacks on probes.

--HG--
extra : convert_revision : b183152acae6e802a49ff8b7c2ff02c455b2e02a

21 years agoMerge ehallnor@zizzer:/bk/m5
Erik Hallnor [Tue, 21 Oct 2003 23:15:03 +0000 (19:15 -0400)]
Merge ehallnor@zizzer:/bk/m5
into zazzer.eecs.umich.edu:/z/ehallnor/clean

--HG--
extra : convert_revision : 53e6b239f96abce99a4cdd34ebcc565902435a7c

21 years agoWhen the Bus blocks now it lets the sender know it was a failed transmission. The...
Erik Hallnor [Tue, 21 Oct 2003 23:14:54 +0000 (19:14 -0400)]
When the Bus blocks now it lets the sender know it was a failed transmission. The request stays buffered in the sender, not on the bus like it used to be.

--HG--
extra : convert_revision : f6a486653b7a4912608f921bd4f7ac7f9dfe9093

21 years agoCreated new M5 instruction to allow an integer parameter (init_param) to be specified...
Andrew Schultz [Tue, 21 Oct 2003 21:18:17 +0000 (17:18 -0400)]
Created new M5 instruction to allow an integer parameter (init_param) to be specified in the INI and then read inside the simulator.

arch/alpha/isa_desc:
    Added new M5FUNC instruction to put allow reading of init_param inside simulator
kern/tru64/tru64_system.cc:
kern/tru64/tru64_system.hh:
sim/system.cc:
sim/system.hh:
    Added support for init_param

--HG--
extra : convert_revision : 8253f0b4239b194d4f04665c9deec1fcdf665c8a

21 years agoMerge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean
Lisa Hsu [Tue, 21 Oct 2003 19:45:56 +0000 (15:45 -0400)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean

--HG--
extra : convert_revision : d639282e403cb085c452223a76cec31933a529aa

21 years agostatistics.hh:
Lisa Hsu [Tue, 21 Oct 2003 19:45:48 +0000 (15:45 -0400)]
statistics.hh:
change VectorDistProxy name to DistProxy - to be more consistent with other proxy namings.

base/statistics.hh:
    change VectorDistProxy name to DistProxy - to be more consistent with other proxy namings.

--HG--
extra : convert_revision : c470c93cf598506be56312db52f6c528c213a149

21 years agoMerge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
Erik Hallnor [Tue, 21 Oct 2003 05:53:41 +0000 (01:53 -0400)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5

--HG--
extra : convert_revision : 1fcdbd9d2efc1e0490716de46c81e94f4b28678b

21 years agomemtest.cc:
Erik Hallnor [Tue, 21 Oct 2003 05:53:27 +0000 (01:53 -0400)]
memtest.cc:
Add probe calls to test update probe path.

cpu/memtest/memtest.cc:
    Add probe calls to test update probe path.

--HG--
extra : convert_revision : b0fb97b54b6ffce9c575fda680b778da63767b7c

21 years agoAdd the probe path to the hierarchy. Two flavors, one updates the location of the...
Erik Hallnor [Tue, 21 Oct 2003 05:51:59 +0000 (01:51 -0400)]
Add the probe path to the hierarchy. Two flavors, one updates the location of the block in memory, the other just reads the most up to date data/writes data wherever it is found.

--HG--
extra : convert_revision : d03776f9b6f181fc543efe54f5628e5338f1df41

21 years agoImplement reset for stats.
Nathan Binkert [Tue, 21 Oct 2003 03:08:27 +0000 (23:08 -0400)]
Implement reset for stats.

base/statistics.cc:
base/statistics.hh:
    Implement a reset for for the statistics package.
    This will cause all stats to be set to their default value.
    Only the currently enabled bin will be reset.
test/Makefile:
    Make tests work again now that we're naming include dirs
    explicitly
test/stattest.cc:
    test reset

--HG--
extra : convert_revision : 8d21cedf6ee91ed0a2412042ea5cb12f79b90eb3

21 years agoClean up callbacks
Nathan Binkert [Tue, 21 Oct 2003 01:38:32 +0000 (21:38 -0400)]
Clean up callbacks

base/callback.hh:
    Don't remove a callback when it is processed.
    Document the callback class

--HG--
extra : convert_revision : 9d15500434fe0e5d623c624aac86976708adf0eb

21 years agoSeparate the stuff for SimObject from SimObject builder.
Nathan Binkert [Tue, 21 Oct 2003 00:17:01 +0000 (20:17 -0400)]
Separate the stuff for SimObject from SimObject builder.
This makes testing a bit easier.

arch/alpha/alpha_memory.cc:
cpu/intr_control.cc:
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
dev/alpha_console.cc:
dev/console.cc:
dev/disk_image.cc:
dev/etherbus.cc:
dev/etherdump.cc:
dev/etherlink.cc:
dev/ethertap.cc:
dev/simple_disk.cc:
kern/tru64/tru64_system.cc:
sim/main.cc:
sim/prog.cc:
    Need to include builder.hh
    sort #includes
sim/sim_object.cc:
sim/sim_object.hh:
    Separate the SimObjectBuilder stuff into its own file

--HG--
extra : convert_revision : e8395e0cc6ae1f180f9cd6f100795a1ac44aeed5

21 years agoMerge zizzer.eecs.umich.edu:/bk/m5
Nathan Binkert [Mon, 20 Oct 2003 13:23:17 +0000 (09:23 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 98fcdc0b893b77230ec69597930a71af227bc490

21 years ago.del-post-incoming.regression~db4d380a8de2f027:
Lisa Hsu [Mon, 20 Oct 2003 05:05:07 +0000 (01:05 -0400)]
.del-post-incoming.regression~db4d380a8de2f027:
Delete: BitKeeper/triggers/post-incoming.regression

--HG--
extra : convert_revision : 48529712a47aa7b72fe666b4cccb290a4fa4812e

21 years agosimple_cpu.cc:
Erik Hallnor [Mon, 20 Oct 2003 04:46:02 +0000 (00:46 -0400)]
simple_cpu.cc:
Add data to static memReq and make everything use it.
Add init of numLoads.

cpu/simple_cpu/simple_cpu.cc:
    Add data to static memReq and make everything use it.
    Add init of numLoads.

--HG--
extra : convert_revision : 47d98aae643c64dff4e5cf1dc770a36434122579

21 years agoCheck in a first stab at a script to sort the #include lines in a source file.
Steve Reinhardt [Mon, 20 Oct 2003 00:42:51 +0000 (17:42 -0700)]
Check in a first stab at a script to sort the #include lines in a source file.
Nate thought this would be cool, and I started on it, but lost interest.
I'm mostly committing this so bk stops bugging me about it.  Nate, don't start
hacking on this until after the ISCA deadline!

--HG--
extra : convert_revision : e0ecc54b118ee99d254e9707b1bba11d4078d7e0

21 years agoGet rid of obsolete code, most of it '#if 0'ed anyway.
Steve Reinhardt [Mon, 20 Oct 2003 00:30:26 +0000 (17:30 -0700)]
Get rid of obsolete code, most of it '#if 0'ed anyway.
Mostly vestiges of Dave's long-gone instruction prefetching stuff.

arch/alpha/isa_traits.hh:
    Delete unused extractInstructionPrefetchTarget().
base/inifile.cc:
    Delete '#if 0' code
cpu/base_cpu.hh:
    Delete unused filterThisInstructionPrefetch() function.
cpu/exetrace.hh:
    Delete '#if 0' code (obsolete flags).

--HG--
extra : convert_revision : c8317f56ba0a0e568daa785825ee938584987bed

21 years agoMerge zizzer.eecs.umich.edu:/bk/m5
Nathan Binkert [Sun, 19 Oct 2003 09:50:53 +0000 (05:50 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : a07675b26bc39cf082e2f4486998718417d43946

21 years agoAdd comment to elaborate on store-conditional result code (and remove
Steve Reinhardt [Sun, 19 Oct 2003 04:21:14 +0000 (21:21 -0700)]
Add comment to elaborate on store-conditional result code (and remove
stale reference to machine.def).

arch/alpha/isa_desc:
    Add comment describing store-conditional result code
cpu/exec_context.hh:
    update comments

--HG--
extra : convert_revision : ac59e0ad7a9440cb6656617fdf05495b59c68f55

21 years agoGet rid of GZIP_PATH
Nathan Binkert [Sat, 18 Oct 2003 12:55:07 +0000 (08:55 -0400)]
Get rid of GZIP_PATH

--HG--
extra : convert_revision : 78cffd79fe441c37a7a3f5a2a4b99349a835e4bf

21 years agoMerge ehallnor@zizzer:/bk/m5
Erik Hallnor [Fri, 17 Oct 2003 21:51:15 +0000 (17:51 -0400)]
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 1d562a8a3c17335399aede18464aabcaaa81ca6c

21 years agoAdd FALRU stats, tweak doxygen configs a bit.
Erik Hallnor [Fri, 17 Oct 2003 21:51:08 +0000 (17:51 -0400)]
Add FALRU stats, tweak doxygen configs a bit.

Doxyfile:
    Remove directories from root exclude list that are covered in the pattern list.
Doxyfile:
    Change default Alpha index columns to 3 since it looks better in the browser.

--HG--
extra : convert_revision : 2d5733bf01e9abf201c0c058f69fbcd57e12ad3b

21 years agoAccidentally ran my delete whitespace program on decoder.cc
Nathan Binkert [Fri, 17 Oct 2003 19:35:50 +0000 (15:35 -0400)]
Accidentally ran my delete whitespace program on decoder.cc
regenerate a decoder.cc from the isa_desc

--HG--
extra : convert_revision : 31d3200208a6e2e079a367c151e7f8bf223b1990

21 years agoAdd a README for the release. Ideally we would move this up a level (to the m5_1.0_beta1
Steve Reinhardt [Fri, 17 Oct 2003 16:32:00 +0000 (09:32 -0700)]
Add a README for the release.  Ideally we would move this up a level (to the
top-level release dir) before shipping it.

--HG--
extra : convert_revision : 3013379ec6dc95217f35aeef9df2e4ac0a33b69f

21 years agoUpdates to doxygen config files.
Steve Reinhardt [Fri, 17 Oct 2003 14:41:25 +0000 (07:41 -0700)]
Updates to doxygen config files.

Doxyfile:
    Make doxygen ignore BitKeeper files

--HG--
extra : convert_revision : 3e277037958675682b1ba674bd57df94af4d6373

21 years agoClear up the last of the Doxygen warnings
Erik Hallnor [Thu, 16 Oct 2003 21:56:16 +0000 (17:56 -0400)]
Clear up the last of the Doxygen warnings

base/statistics.hh:
    Document the friend class because doxygen can't handle the template instantiation.
kern/tru64/dump_mbuf.cc:
kern/tru64/dump_mbuf.hh:
kern/tru64/printf.cc:
kern/tru64/printf.hh:
kern/tru64/tru64_events.cc:
    Change namespace from Tru64 to tru64 (There is a class Tru64, and it was confusing doxygen).

--HG--
extra : convert_revision : 9644b1324814952cb6a2d98fd2ab4d07f0860b45

21 years agoMerge ehallnor@zizzer:/bk/m5
Erik Hallnor [Thu, 16 Oct 2003 21:04:25 +0000 (17:04 -0400)]
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 2979dcbf516446b45c7fb94454e4c4f013f480e4

21 years agoAdd a commited loads event queue similar to the one for commited instructions.
Erik Hallnor [Thu, 16 Oct 2003 21:04:18 +0000 (17:04 -0400)]
Add a commited loads event queue similar to the one for commited instructions.
Two new parameters for the CPU models, max_loads_any_thread and max_loads_all_threads.

cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
    Swap out maxReads for the new commited loads model.

--HG--
extra : convert_revision : 35031329bbc476122b2203104537a9f8b46addfa

21 years agoAdded to new doxygen configs (posting internally and externally).
Erik Hallnor [Thu, 16 Oct 2003 21:02:14 +0000 (17:02 -0400)]
Added to new doxygen configs (posting internally and externally).
Changed the default to not use dot to speed testing of documentation for warnings.
We probably don't want to release postint and postext since there is
information about absolute file locations in them.

Doxyfile:
    Turn of DOT for local testing.

--HG--
extra : convert_revision : 04df481c7a238e7745e90a011e43f8c533888567

21 years agoMerge stever@zizzer:/bk/m5 into vm1.vmnet.nat:/z/stever/bk/m5
Steve Reinhardt [Thu, 16 Oct 2003 19:41:50 +0000 (12:41 -0700)]
Merge stever@zizzer:/bk/m5 into vm1.vmnet.nat:/z/stever/bk/m5

--HG--
extra : convert_revision : 0262799031839bc27f08e207e6a6dfcc97c50ac5

21 years agoMinor documentation tweaks.
Steve Reinhardt [Thu, 16 Oct 2003 19:41:35 +0000 (12:41 -0700)]
Minor documentation tweaks.

arch/alpha/aout_machdep.h:
    Comment aout_exechdr fields to make doxygen happy.

--HG--
extra : convert_revision : 23fe88cb7ee511ccd83d2779024daf015133c9ce

21 years agopost-incoming.regression:
Lisa Hsu [Thu, 16 Oct 2003 19:28:40 +0000 (15:28 -0400)]
post-incoming.regression:
dirname in this repo too

--HG--
extra : convert_revision : c099dbd2e247d327cce6c2cfa744fea0a6cf9b3d

21 years agopost-incoming.regression:
Lisa Hsu [Thu, 16 Oct 2003 13:39:08 +0000 (09:39 -0400)]
post-incoming.regression:
added log info

--HG--
extra : convert_revision : a8c2c75d59c3cadb03597bc1923099ff650ab298

21 years agopost-incoming.regression:
Lisa Hsu [Thu, 16 Oct 2003 13:23:48 +0000 (09:23 -0400)]
post-incoming.regression:
finally, the right one.  so simple, yet path so heinous.

--HG--
extra : convert_revision : 7eeece20d36bed9d868771dc0eaf865eeee8dda3

21 years agoDon't chmod generated source files because bitkeeper
Nathan Binkert [Thu, 16 Oct 2003 04:06:29 +0000 (00:06 -0400)]
Don't chmod generated source files because bitkeeper
just complains too much.

--HG--
extra : convert_revision : cf7eaf89f5a0b65d7ed54b697cb3f2a65742358e

21 years agodisable the post-incoming.regression for now
Nathan Binkert [Thu, 16 Oct 2003 03:56:13 +0000 (23:56 -0400)]
disable the post-incoming.regression for now

--HG--
extra : convert_revision : da6710c255ff4e4c46048f09bc2106f9ef8f0311

21 years agofix another bug
Nathan Binkert [Thu, 16 Oct 2003 03:51:43 +0000 (23:51 -0400)]
fix another bug

--HG--
extra : convert_revision : 8c250f65b1a56b732c328e5f7599e269def2241b

21 years agoremove a newline
Nathan Binkert [Thu, 16 Oct 2003 03:48:41 +0000 (23:48 -0400)]
remove a newline

--HG--
extra : convert_revision : e7662de4cac06bd95d33fc1ba47fd2b6ab4ef864

21 years agoMerge ehallnor@zizzer:/bk/m5
Erik Hallnor [Thu, 16 Oct 2003 03:08:52 +0000 (23:08 -0400)]
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 98e87516378744d70eae8536344d0484a0fc9042

21 years agoSet the default number of write buffers to 8, add write_buffer param to cache
Erik Hallnor [Thu, 16 Oct 2003 03:07:32 +0000 (23:07 -0400)]
Set the default number of write buffers to 8, add write_buffer param to cache
to specify it.

--HG--
extra : convert_revision : c18a008a4b00465e9764f0ba07d4d0d8209f3305

21 years agopost-incoming.regression:
Nathan Binkert [Thu, 16 Oct 2003 02:12:56 +0000 (22:12 -0400)]
post-incoming.regression:
use the correct operator

--HG--
extra : convert_revision : 1ed4e5c0ea56db1e39e43b700b8d250ecff8a596

21 years agofooter.html:
Lisa Hsu [Thu, 16 Oct 2003 00:49:12 +0000 (20:49 -0400)]
footer.html:
removed blank line

docs/footer.html:
    removed blank line

--HG--
extra : convert_revision : 6bccc4e3b5c01e2ccffd69e2127df651512d4670

21 years agopost-incoming.regression:
Lisa Hsu [Thu, 16 Oct 2003 00:47:51 +0000 (20:47 -0400)]
post-incoming.regression:
lost an i, hehe, in cut and paste

--HG--
extra : convert_revision : 4826b74b20802f4e8a946b2fe320b7f947b0dd7d

21 years agofooter.html:
Lisa Hsu [Thu, 16 Oct 2003 00:45:11 +0000 (20:45 -0400)]
footer.html:
added blank space

docs/footer.html:
    added blank space

--HG--
extra : convert_revision : 7366ca4d4ce27498b629bb697c674d8ede82c750

21 years agopost-incoming.regression:
Lisa Hsu [Thu, 16 Oct 2003 00:41:55 +0000 (20:41 -0400)]
post-incoming.regression:
new file

--HG--
extra : convert_revision : 19052541e73693dc090f588d8283bf8560ad5563

21 years agoNeed to cast to avoid infinite recursion.
Erik Hallnor [Wed, 15 Oct 2003 21:36:10 +0000 (17:36 -0400)]
Need to cast to avoid infinite recursion.

--HG--
extra : convert_revision : 1c2faba65e1112f0972bae330cbde4a563429b73

21 years agoRemove conflicts
Erik Hallnor [Wed, 15 Oct 2003 21:17:19 +0000 (17:17 -0400)]
Remove conflicts

--HG--
extra : convert_revision : c680884d3e758fab5ce3a258ec277f1a22f87ea1

21 years agoAdd a stat to track the cycle when the cache has all blocks touched (if ever).
Erik Hallnor [Wed, 15 Oct 2003 21:11:46 +0000 (17:11 -0400)]
Add a stat to track the cycle when the cache has all blocks touched (if ever).

--HG--
extra : convert_revision : 5bc15c55eddd58336625997817f583e0d43225c6

21 years agoFix the default target for the makefile
Nathan Binkert [Wed, 15 Oct 2003 20:42:53 +0000 (16:42 -0400)]
Fix the default target for the makefile

--HG--
extra : convert_revision : 32f2018fbe761121a848f0a7a980523514fc7710

21 years agoGlobal whitespace fixes
Nathan Binkert [Wed, 15 Oct 2003 20:39:37 +0000 (16:39 -0400)]
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

21 years agoFix up the targetarch target so that things build a little
Nathan Binkert [Wed, 15 Oct 2003 20:22:50 +0000 (16:22 -0400)]
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

21 years agoMerge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
Nathan Binkert [Tue, 14 Oct 2003 22:04:28 +0000 (18:04 -0400)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : d5ba96b559be93774e82692099675b6d1f525221

21 years agotry to get everything to compile correctly again
Nathan Binkert [Tue, 14 Oct 2003 22:04:20 +0000 (18:04 -0400)]
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

21 years agoMerge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
Steve Raasch [Tue, 14 Oct 2003 21:06:05 +0000 (17:06 -0400)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/y/sraasch/m5

--HG--
extra : convert_revision : 022364d1e5bf2f3b004ba75164580c1a821b16a5