Commit graph

692 commits

Author SHA1 Message Date
Nathan Binkert
9374efa725 wrap debugging stuff with #ifdef DEBUG
--HG--
extra : convert_revision : 8205633c1c1b49b04f389aa40f95fbbc03a43fb6
2004-01-29 22:30:14 -05:00
Erik Hallnor
ca11c9d3e7 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : a74364b249fc6164ef2752ff1e3d6e414b5ab79d
2004-01-29 20:15:54 -05:00
Nathan Binkert
cb35f819c5 delete the data in the arglist when the list is destroyed,
not while printing out the data.  This allows the data
to be dumped more than once.

base/cprintf.hh:
    need a destructor

--HG--
extra : convert_revision : 235e9fe24488ac4c0ae1b562ef9fa6e0bd1e899c
2004-01-29 17:44:08 -05:00
Nathan Binkert
fe4d9f124f whack debugging statement
--HG--
extra : convert_revision : f623d35a6e5a234e2b203974012c653b91826dbf
2004-01-29 16:33:03 -05:00
Nathan Binkert
ee4263f72e Fix character input by handling the character and the
special console values separately.

dev/alpha_console.cc:
    use new console specific input function

--HG--
extra : convert_revision : 08997d6115d2aac3a26cac2774b3c3fc0cd76ab0
2004-01-29 16:32:03 -05:00
Erik Hallnor
a0932d4e99 Logical test fix.
--HG--
extra : convert_revision : 4b009938216748275e8b74f7a768a8ef257fb691
2004-01-29 14:42:30 -05:00
Erik Hallnor
c2ae978e09 Add operator= to CacheBlk to simplify some functions.
--HG--
extra : convert_revision : 949a24f46f647dc2c4d0b60df4684b4f7164a04f
2004-01-29 14:36:18 -05:00
Nathan Binkert
639037d127 remove #include of nonexistent file
sim/universe.cc:
    oops.  this doesn't exist

--HG--
extra : convert_revision : 2cfb3680e4ebe3f27f22a79f853d4d6df445e65a
2004-01-29 10:32:01 -05:00
Nathan Binkert
2db1b6ea1b provide an output stream for simulator output. (This takes place of the
statStream catchall that we had before)
Also provide an optional output directory that multiple simulator output
files can be written to.
Make most output files use the output directory

base/misc.cc:
    send warnings to the outputStream as well
base/trace.cc:
    dprintf_stream defaults to cerr
dev/console.cc:
    use the output directory for the console output if it exists
dev/etherdump.cc:
    dump to the output directory if it exists
sim/builder.cc:
sim/builder.hh:
    move constructor and destructor to .cc file
    use a function to get the stream that the builder dumps its
    output to, and create a separate file in the output directory
    if able
sim/main.cc:
    statStream -> outputStream
sim/serialize.cc:
    dump checkpoints to the output directory if specified
sim/universe.cc:
    provide an output stream for simulator output.  (This takes place of the
    statStream catchall that we had before)
    Also provide an optional output directory that multiple simulator output
    files can be written to.

--HG--
extra : convert_revision : 03abce20edbbf7ec19c9ddd8d69ec8485c383532
2004-01-29 00:38:18 -05:00
Nathan Binkert
f994cf4b5e use $ENV{PWD} so that the amd paths work ok.
Also, compare real paths to ensure that the links point
to the right place

--HG--
extra : convert_revision : f4127a67f02b714808c6d2181fabf245ed2309c0
2004-01-29 00:37:07 -05:00
Nathan Binkert
dc70ce3a60 cleanup on aisle 5
base/statistics.cc:
    dead code

--HG--
extra : convert_revision : 8f3fd638acdf7a704475ea90b607a3225a3c174d
2004-01-29 00:36:22 -05:00
Andrew Schultz
2fb876e55d Remove references to dep_tree to fix build
--HG--
extra : convert_revision : dff311c1a18bd01750c1b5902410c23e0f43b798
2004-01-28 23:00:30 -05:00
Steve Raasch
f50d1ef1c8 removing the last vestages of the dep-tree stuff (hasn't worked for a LONG time)
--HG--
extra : convert_revision : 145d56564ccca3a3c1c3d9115a4b8a5fb52c301d
2004-01-28 18:06:07 -05:00
Steve Reinhardt
b0344b7618 Minor optimization of new LRU stack code.
--HG--
extra : convert_revision : 953bc2f1ceab1cec9f48d65b94cc075655f6e9ec
2004-01-27 22:26:59 -08:00
Steve Reinhardt
3a85b9db1c Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : 2005ed2f551f2a80cbf62a41daaa3c4fa5af6fb3
2004-01-27 19:33:59 -08:00
Nathan Binkert
801c46d250 a bunch of warning fixes
arch/alpha/isa_desc:
    don't say warn: Warning:
base/misc.cc:
    avoid printing two newlines in a row
sim/main.cc:
    print out a message just before we enter the event queue

--HG--
extra : convert_revision : 2a824d4b67661903fc739a0fb0759aa91d72382c
2004-01-27 17:56:23 -05:00
Erik Hallnor
ee6b889ad5 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 47f69e4fb2d8727927e40fb6f2abf3dcab654c12
2004-01-27 16:40:17 -05:00
Erik Hallnor
6e61efbbb5 Remove SS-like code from lru.hh/cc
--HG--
extra : convert_revision : 66baf998671a24e6a630d2f35c2f529418cd4d5b
2004-01-27 16:40:04 -05:00
Nathan Binkert
f7a8db20fe Always write out a value for pending so that an m5.fast simulator can
generate a checkpoint that an m5.debug simulator can use

--HG--
extra : convert_revision : eec2d94013119236a9c65c9b5fb6c2ccb0480f51
2004-01-27 13:55:50 -05:00
Nathan Binkert
9bbec8808b Add trace flag for the sampling CPU
--HG--
extra : convert_revision : 928588d46fa069e869416f4f5df8041849625e9f
2004-01-27 12:45:12 -05:00
Steve Reinhardt
04a7331298 Minor cleanup of sb_issue() in full_cpu/issue.cc.
--HG--
extra : convert_revision : 4bf69125c37a067a3a06022226a7eb38dcaaf6d1
2004-01-25 21:53:32 -08:00
Erik Hallnor
01059eaded Change the way the hierarchy is separated. Now all virtual functions are in the interfaces. This allows new bus models to be used without major hassle. And I thought it was time to change it all again anyways.
cpu/simple_cpu/simple_cpu.cc:
    Switch doEvents to doEvents()

--HG--
extra : convert_revision : 14b9517017e76c7b941247004393bf260f397d9a
2004-01-25 05:01:00 -05:00
Erik Hallnor
fde0b7bfaf I hate compiling decoder.cc every time I touch something.
--HG--
extra : convert_revision : b79519452947ea7b110922d5a3dae2f3dfc0b916
2004-01-21 14:22:55 -05:00
Steve Reinhardt
946b481831 Set LIBELF_LINUX to 0 to build on zax. Builds
but did not test... however the only thing this
affects in libelf is the header, so I don't expect
any functional problems.

base/loader/elf_object.cc:
    Set LIBELF_LINUX to 0 to build on zax.

--HG--
extra : convert_revision : d024b33deff6fc8ea6f1d465f76dc8d9d63254ab
2004-01-20 13:53:18 -05:00
Nathan Binkert
c9f2aa8c18 Make each stat take up one full line. This allows us to use grep
to find and remove stats from the files so we can put less
burden on the python interpreter.

base/statistics.cc:
    Manually insert newlines into the python code so that we now have one
    stat per line.  (Make it so we can use grep -v to remove stats)
test/stattest.cc:
    update to reflect changes in how python is accessed

--HG--
extra : convert_revision : 554edcf9c795b33d00d3d15554447c8accebebfa
2004-01-15 16:33:58 -05:00
Nathan Binkert
81575e74e7 Make the python stats script more robust
--HG--
extra : convert_revision : a7680d5cdeac96345e8f521cfb96fccaa3e7a7f6
2004-01-15 14:29:34 -05:00
Nathan Binkert
454d10554a Make dump cycle relative
--HG--
extra : convert_revision : 3434f60fa08d1543358c1209be8a5cfbe43a53bf
2004-01-15 14:29:09 -05:00
Steve Reinhardt
8fd48f5eb0 Update simple-* configs to Erik's new hierarchy parameter thing.
--HG--
extra : convert_revision : de591f6ecfc9a0a20caefb4b82084d1b2ef3433b
2004-01-14 22:50:12 -08:00
Steve Reinhardt
9f2aae4e28 Fixes and cleanup to elf loader code.
base/loader/elf_object.cc:
    - Use program header instead of section headers for loading.
    The old code doesn't work for Alpha/Linux user binaries.

    - Deal properly with single-segment ELF executables (e.g. kernels)...
    haven't tested this but it looks like it matches the functionality
    of the patch the L4::Pistachio guys sent.

    - Factor load symbol code into one common function.

    - Some formatting to match style conventions.

    - Only include libelf stuff in .cc file, not .hh.
base/loader/elf_object.hh:
    - Use program header instead of section headers for loading.
    The old code doesn't work for Alpha/Linux user binaries.

    - Factor load symbol code into one common function.

    - Only include libelf stuff in .cc file, not .hh.

--HG--
extra : convert_revision : 782062d09d43083b01e65cd645c941f49c27640a
2004-01-14 22:30:16 -08:00
Erik Hallnor
fe32fdece2 Merge codebases for CompressedMemBank and SimpleMemBank into one templatized class
--HG--
extra : convert_revision : 04feb72fc4edbbbe1b37b7f618c9fbcbc8a72358
2004-01-14 16:14:15 -05:00
Nathan Binkert
276dbac7ce Use the new init phase to initialized the switch event
so that we can make the first switch time relative.

--HG--
extra : convert_revision : c81beba2e1bd8629d6c7b386bb213980434030ec
2004-01-14 02:06:35 -05:00
Nathan Binkert
5d7224cc92 Setup initialization callbacks
--HG--
extra : convert_revision : ec56a839a0489c5494bfcd9ead0fc3866f1e8ac2
2004-01-14 02:00:20 -05:00
Erik Hallnor
e650870c15 update for new hierarchy parameters
--HG--
extra : convert_revision : a65f77d6ab704609d9c2ae2c85d4f893fa198cf9
2004-01-13 15:23:54 -05:00
Erik Hallnor
003d2d724c Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 52437e42f15899db46525ad91b2e43c2a96ace36
2004-01-13 02:10:48 -05:00
Erik Hallnor
413bfc68e6 Change to a new centralized way to specify the memory hierarchy parameters (do_data and do_events). If you use the defaults (false and true respectively) you don't have to change your INI files.
arch/alpha/isa_traits.hh:
    Add a constant for the maximum address value called MaxAddr.

--HG--
extra : convert_revision : 1371e8b713cc6ed134093e9c208db35dc9741ac7
2004-01-13 02:10:35 -05:00
Nathan Binkert
4cda5224f6 - quick support for using a regular expression to select
which stats to print
- print out the subname

--HG--
extra : convert_revision : 2960bd33654e55fe0f6279b09dce42b1216188c8
2004-01-12 18:39:39 -05:00
Nathan Binkert
308153665d Commit the correct version of the code
--HG--
extra : convert_revision : 74555b2676fe20d4a742a272b6c97e3a8a237d68
2004-01-12 15:45:51 -05:00
Nathan Binkert
b1295a7317 make the python stuff executable
--HG--
extra : convert_revision : 04c9ff03880f55483466e56109536b74d9163ccd
2004-01-12 13:38:37 -05:00
Nathan Binkert
8384f25620 Check in python script that reads the python stats output.
Still needs a lot of work, but it's at least as good as the
normal output, and has some features that normal ouput is missing
such as bin totalling with correct formulas and totalling of
2d vectors and such.  It will also filter out specific stats
for printing.  (basically grep, but no mistakes.)

--HG--
extra : convert_revision : 05d0f0489483a32145cf6508122cfbc7ea57e204
2004-01-12 13:31:59 -05:00
Nathan Binkert
b4301c652c Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : bff2fb78e205f327ce8d04f3ae1b2352857ab824
2004-01-11 21:22:33 -05:00
Steve Reinhardt
f8ed615bc6 Minor cleanup to bk ignore and makefile libelf rule.
--HG--
extra : convert_revision : 77dd858344a74dea15bb36bcb0de04f3af9260f3
2004-01-11 15:26:48 -08:00
Steve Reinhardt
510eef0fa0 Modify handling of serialize:dir parameter to make it more useful.
Move global checkpoint-related functions and vars into Checkpoint class (as statics).

arch/alpha/pseudo_inst.cc:
dev/disk_image.cc:
    Move global checkpoint-related functions and vars
    into Checkpoint class (as statics).
sim/serialize.cc:
    Move global checkpoint-related functions and vars
    into Checkpoint class (as statics).

    Checkpoint constructor now takes checkpoint directory name instead
    of file name.

    Make serialize:dir parameter actually set checkpoint directory name
    instead of directory in which checkpoint directory is created.  If
    the value contains a '%', the curTick value is sprintf'd into the
    format to create the directory name.  The default is backwards compatible
    with the old fixed name ("m5.%012d").
sim/serialize.hh:
    Move global checkpoint-related functions and vars
    into Checkpoint class (as statics).

    Checkpoint constructor now takes checkpoint directory name instead
    of file name.

--HG--
extra : convert_revision : d0aa87b62911f405a4f5811271b9e6351fdd9fe4
2004-01-11 15:24:18 -08:00
Steve Reinhardt
7e07aa9300 Fix cprintf bug, plus minor cleanup & better error messages.
base/cprintf.cc:
    Fix bug where a call with a format string with no specifiers
    but one or more arguments would crash.  Old code tried to print
    extra args using last available format, but in this case there
    was no format, hence the problem.  Now we just print "<extra arg>"
    for each extra arg.

    Also reorganized code a bit to make scope of fmt variable
    match the scope in which you can be confident it's meaningful.
base/cprintf.hh:
    Print specific error message instead of calling format_invalid().
base/cprintf_formats.hh:
    Clear Format object in constructor.
    Use specific error messages instead of format_invalid() function.

--HG--
extra : convert_revision : 87d5e902174e3eb2583131d056742af166540db0
2004-01-11 15:09:27 -08:00
Ali Saidi
54b6d8c5a8 the build directory is now correctly created
--HG--
extra : convert_revision : 4a7b91821e2de64e400417f8ac503af7e596571d
2004-01-08 22:42:21 -05:00
Ali Saidi
98613950a3 Fixed another small libelf problem, everything should work now, on any
machine.

base/loader/elf_object.hh:
    put #defines for libelf that normally arn't defined so that -Wundef
    doesn't cause problems.

--HG--
extra : convert_revision : fa2de6aa94c7ddbaa59990db4473402b0df7d93a
2004-01-08 16:35:47 -05:00
Ali Saidi
e7033f718f should now build... fixed relative path problem
--HG--
extra : convert_revision : 78c9445993a84b68be1b0a477555246f1ea6ce0c
2004-01-08 14:13:31 -05:00
Nathan Binkert
a3691fe09e Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : b7411b25ae9e3a546996aec59e1a67cbe728da85
2004-01-08 12:25:49 -05:00
Ali Saidi
14b4119aaf Changed elf_object.* to use libelf for reading elf files. The makefile
and setup filed had to be modified to build libelf. The ext repository
MUST exist in the directory below m5!

base/loader/elf_object.cc:
base/loader/elf_object.hh:
    now uses libelf to read elf binaries

--HG--
extra : convert_revision : b70511f5379edf35d639f3bb64b786cb0bd180af
2004-01-07 19:46:45 -05:00
Nathan Binkert
9dcfdce732 Improve python output support
fix some bugs

base/statistics.cc:
    -  Move the python dump stream stuff into the statistics package
    because it needs more control over the file when there
    are multiple dumps
    -  add a subname to the output
    -  make all of the stats a list instead of variable arguments to
    get around the 255 argument limit
    -  the description needs to be triple quoted
    -  avoid errors for formulas that don't have any root element
    set up.
base/statistics.hh:
    -  get rid of mode_python and just separate python dumping from
    regular stats dumping
    -  fix a huge bug that made a Formula use a VectorData instead
    of a FormulaData

--HG--
extra : convert_revision : 7303cff3ccdcc3d306ab17375219fc7fecac7e5e
2003-12-28 12:48:13 -05:00
Erik Hallnor
85d75e6dfc Add a uni-directional bus bridge
--HG--
extra : convert_revision : 37d30638eb0d988fc1089c7945f535e2979ca8e4
2003-12-28 00:41:47 -05:00