Commit graph

156 commits

Author SHA1 Message Date
Lisa Hsu
a7c88ad2ae Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean
--HG--
extra : convert_revision : 112a99bde10ea9c56f2390389dd13c024e298331
2003-10-21 23:18:07 -04:00
Lisa Hsu
ede195161b 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
2003-10-21 23:17:55 -04:00
Erik Hallnor
6bc700e1ad Merge ehallnor@zizzer:/bk/m5
into zazzer.eecs.umich.edu:/z/ehallnor/clean

--HG--
extra : convert_revision : 53e6b239f96abce99a4cdd34ebcc565902435a7c
2003-10-21 19:15:03 -04:00
Erik Hallnor
67f6771721 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
2003-10-21 19:14:54 -04:00
Andrew Schultz
f600cff5c2 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
2003-10-21 17:18:17 -04:00
Lisa Hsu
ae232a883a Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean
--HG--
extra : convert_revision : d639282e403cb085c452223a76cec31933a529aa
2003-10-21 15:45:56 -04:00
Lisa Hsu
f600ac613e 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
2003-10-21 15:45:48 -04:00
Erik Hallnor
f3d6ac18e8 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 1fcdbd9d2efc1e0490716de46c81e94f4b28678b
2003-10-21 01:53:41 -04:00
Erik Hallnor
456b9af0c8 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
2003-10-21 01:53:27 -04:00
Erik Hallnor
e99c0f901c 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
2003-10-21 01:51:59 -04:00
Nathan Binkert
02bacb2dfd 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
2003-10-20 23:08:27 -04:00
Nathan Binkert
df488c0e70 Clean up callbacks
base/callback.hh:
    Don't remove a callback when it is processed.
    Document the callback class

--HG--
extra : convert_revision : 9d15500434fe0e5d623c624aac86976708adf0eb
2003-10-20 21:38:32 -04:00
Nathan Binkert
e0b065ff7c 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
2003-10-20 20:17:01 -04:00
Nathan Binkert
4963dbf9a9 Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 98fcdc0b893b77230ec69597930a71af227bc490
2003-10-20 09:23:17 -04:00
Lisa Hsu
4489583dfe .del-post-incoming.regression~db4d380a8de2f027:
Delete: BitKeeper/triggers/post-incoming.regression

--HG--
extra : convert_revision : 48529712a47aa7b72fe666b4cccb290a4fa4812e
2003-10-20 01:05:07 -04:00
Erik Hallnor
2c7a0b87f5 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
2003-10-20 00:46:02 -04:00
Steve Reinhardt
789a2de6f8 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
2003-10-19 17:42:51 -07:00
Steve Reinhardt
f951b00d89 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
2003-10-19 17:30:26 -07:00
Nathan Binkert
2f37dd455a Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : a07675b26bc39cf082e2f4486998718417d43946
2003-10-19 05:50:53 -04:00
Steve Reinhardt
83d32482dc 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
2003-10-18 21:21:14 -07:00
Nathan Binkert
ba12dee914 Get rid of GZIP_PATH
--HG--
extra : convert_revision : 78cffd79fe441c37a7a3f5a2a4b99349a835e4bf
2003-10-18 08:55:07 -04:00
Erik Hallnor
1bebc1ab2f Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 1d562a8a3c17335399aede18464aabcaaa81ca6c
2003-10-17 17:51:15 -04:00
Erik Hallnor
eec404abe6 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
2003-10-17 17:51:08 -04:00
Nathan Binkert
24a1ee1ac5 Accidentally ran my delete whitespace program on decoder.cc
regenerate a decoder.cc from the isa_desc

--HG--
extra : convert_revision : 31d3200208a6e2e079a367c151e7f8bf223b1990
2003-10-17 15:35:50 -04:00
Steve Reinhardt
73f78b9587 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
2003-10-17 09:32:00 -07:00
Steve Reinhardt
73c1802f7a Updates to doxygen config files.
Doxyfile:
    Make doxygen ignore BitKeeper files

--HG--
extra : convert_revision : 3e277037958675682b1ba674bd57df94af4d6373
2003-10-17 07:41:25 -07:00
Erik Hallnor
c093f29f6b 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
2003-10-16 17:56:16 -04:00
Erik Hallnor
aeaf133d27 Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 2979dcbf516446b45c7fb94454e4c4f013f480e4
2003-10-16 17:04:25 -04:00
Erik Hallnor
4134477369 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
2003-10-16 17:04:18 -04:00
Erik Hallnor
ea5dc1d5df 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
2003-10-16 17:02:14 -04:00
Steve Reinhardt
a6788d64dd Merge stever@zizzer:/bk/m5 into vm1.vmnet.nat:/z/stever/bk/m5
--HG--
extra : convert_revision : 0262799031839bc27f08e207e6a6dfcc97c50ac5
2003-10-16 12:41:50 -07:00
Steve Reinhardt
8b4f16a727 Minor documentation tweaks.
arch/alpha/aout_machdep.h:
    Comment aout_exechdr fields to make doxygen happy.

--HG--
extra : convert_revision : 23fe88cb7ee511ccd83d2779024daf015133c9ce
2003-10-16 12:41:35 -07:00
Lisa Hsu
cd22503eda post-incoming.regression:
dirname in this repo too

--HG--
extra : convert_revision : c099dbd2e247d327cce6c2cfa744fea0a6cf9b3d
2003-10-16 15:28:40 -04:00
Lisa Hsu
5e7f7a268d post-incoming.regression:
added log info

--HG--
extra : convert_revision : a8c2c75d59c3cadb03597bc1923099ff650ab298
2003-10-16 09:39:08 -04:00
Lisa Hsu
323306795e post-incoming.regression:
finally, the right one.  so simple, yet path so heinous.

--HG--
extra : convert_revision : 7eeece20d36bed9d868771dc0eaf865eeee8dda3
2003-10-16 09:23:48 -04:00
Nathan Binkert
5ebda9ef2c Don't chmod generated source files because bitkeeper
just complains too much.

--HG--
extra : convert_revision : cf7eaf89f5a0b65d7ed54b697cb3f2a65742358e
2003-10-16 00:06:29 -04:00
Nathan Binkert
5a361bfe4d disable the post-incoming.regression for now
--HG--
extra : convert_revision : da6710c255ff4e4c46048f09bc2106f9ef8f0311
2003-10-15 23:56:13 -04:00
Nathan Binkert
d9d3d9af54 fix another bug
--HG--
extra : convert_revision : 8c250f65b1a56b732c328e5f7599e269def2241b
2003-10-15 23:51:43 -04:00
Nathan Binkert
7c8a97b8ea remove a newline
--HG--
extra : convert_revision : e7662de4cac06bd95d33fc1ba47fd2b6ab4ef864
2003-10-15 23:48:41 -04:00
Erik Hallnor
6e6bc57088 Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : 98e87516378744d70eae8536344d0484a0fc9042
2003-10-15 23:08:52 -04:00
Erik Hallnor
9429297274 Set the default number of write buffers to 8, add write_buffer param to cache
to specify it.

--HG--
extra : convert_revision : c18a008a4b00465e9764f0ba07d4d0d8209f3305
2003-10-15 23:07:32 -04:00
Nathan Binkert
7315c32058 post-incoming.regression:
use the correct operator

--HG--
extra : convert_revision : 1ed4e5c0ea56db1e39e43b700b8d250ecff8a596
2003-10-15 22:12:56 -04:00
Lisa Hsu
1d9e047397 footer.html:
removed blank line

docs/footer.html:
    removed blank line

--HG--
extra : convert_revision : 6bccc4e3b5c01e2ccffd69e2127df651512d4670
2003-10-15 20:49:12 -04:00
Lisa Hsu
69143668ad post-incoming.regression:
lost an i, hehe, in cut and paste

--HG--
extra : convert_revision : 4826b74b20802f4e8a946b2fe320b7f947b0dd7d
2003-10-15 20:47:51 -04:00
Lisa Hsu
b9362e4b6f footer.html:
added blank space

docs/footer.html:
    added blank space

--HG--
extra : convert_revision : 7366ca4d4ce27498b629bb697c674d8ede82c750
2003-10-15 20:45:11 -04:00
Lisa Hsu
c0c79399fa post-incoming.regression:
new file

--HG--
extra : convert_revision : 19052541e73693dc090f588d8283bf8560ad5563
2003-10-15 20:41:55 -04:00
Erik Hallnor
1f3f180b95 Need to cast to avoid infinite recursion.
--HG--
extra : convert_revision : 1c2faba65e1112f0972bae330cbde4a563429b73
2003-10-15 17:36:10 -04:00
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