Commit graph

506 commits

Author SHA1 Message Date
Steve Reinhardt 98948b2e57 More reformatting of reference parameter declarations.
The last change only caught the ones with types that
started with capitals.  This pass catches the rest
(mostly STL and uint*_t types).

base/cprintf_formats.hh:
cpu/simple_cpu/simple_cpu.cc:
sim/serialize.cc:
sim/serialize.hh:
    Change "foo_t& foo" to "foo_t &foo".

--HG--
extra : convert_revision : fc7f7425db2aef33e490f952b5ce74c8c36d0d41
2004-02-04 11:16:30 -08:00
Nathan Binkert 368e6e3e57 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 9b8a94cbaacbbb4a53d15c0893ee4d3183f29ce0
2004-02-03 10:51:10 -05:00
Nathan Binkert b1221a3395 Remote debugging cleanup and internal debugging support
base/kgdb.h:
    Remove flags that aren't used
base/remote_gdb.cc:
    Better debugging:
    - Give each class a name() function so that the trace infrastructure
    knows the correct object name.
    - Make the remote debugger capable of detach.
    - Split out the RGDB trace flag into a bunch of specific flags.
    Remove dead code
    Add a new trap type
base/remote_gdb.hh:
    Add a name() to the various objects for the trace system
base/trace.hh:
    don't need a using directive
    add DPRINTFNR: debug printf, no flag, raw output
kern/tru64/tru64_system.cc:
    use the INT trap type instead of IF

--HG--
extra : convert_revision : 25e610216c6f43d5d328651bba915f71bade059e
2004-02-03 10:50:04 -05:00
Steve Reinhardt 3e5070a3f1 Fix bug: forgot branchTarget() method on indirect branches.
arch/alpha/isa_desc:
    Add missing branchTarget() method for indirect branches.
cpu/static_inst.hh:
    Add comment clarifying when branchTarget() can be used
    on indirect branches.

--HG--
extra : convert_revision : 0dcfb36a9792a338cefceb3d1501825abace7ac5
2004-02-03 07:19:05 -08:00
Steve Reinhardt 2f369ee5d5 Fix handling of uncacheable loads. Make them wait until they're at the tail of
the ROB (so we know they're correct-path) before we mark them ready to issue.

--HG--
extra : convert_revision : be1d431bdc939100d79a5fea3e415b3acf9e8d75
2004-02-02 19:09:47 -08:00
Steve Reinhardt 19cc144960 Get rid of LVQ-port function unit... only used for redundant
multithreading, which has been gone for a long time.

--HG--
extra : convert_revision : 717d13455483c3adc7b7cbbcc5f7493d51867974
2004-02-02 18:58:23 -08:00
Steve Reinhardt 9bfd18a155 Clean up some confusing ROBStation fields left over from SS (ea_comp, in_LSQ).
Eliminate indirect decoder.cc dependence on rob_station.hh via full_cpu.hh.

--HG--
extra : convert_revision : 9355cddd6cd8bbe100aae1b2d45d2752e76ba3f6
2004-02-02 18:53:27 -08:00
Steve Reinhardt b79f6b3273 insn->inst
--HG--
extra : convert_revision : fcc556fb7e65855ec3c04ef272177c8e7a38fff9
2004-02-02 18:14:11 -08:00
Steve Reinhardt 548b4a1cb0 Change "Foo& foo" declarations to "Foo &foo".
This primarily to be internally consistent (sometimes we used one,
sometimes the other, even within the same line of code!).
I picked the latter to be symmetric with "Foo *foo".

base/cprintf_formats.hh:
base/range.hh:
base/refcnt.hh:
base/res_list.hh:
base/statistics.hh:
base/str.hh:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
sim/serialize.cc:
sim/serialize.hh:
sim/syscall_emul.hh:
    Change "Foo& foo" declarations to "Foo &foo".

--HG--
extra : convert_revision : ca1b0e85a578b539214bda3b8d61ac23792f2e87
2004-02-02 15:55:35 -08:00
Steve Reinhardt 956aff1291 More conversions of ref-counted parameters to references:
Statistics::NodePtr, StaticInstPtr, ethernet PacketPtr.

base/statistics.hh:
    Change NodePtr parameters to Nodeptr &.
cpu/exetrace.hh:
    Change StaticInstPtr parameters to StaticInstPtr &.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherdump.cc:
dev/etherdump.hh:
dev/etherint.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ethertap.hh:
    change PacketPtr parameters to PacketPtr &.

--HG--
extra : convert_revision : a778efdca33b0ec5beb76cf47db0e9e4728897ee
2004-02-02 15:45:22 -08:00
Steve Reinhardt 7b07b0877f Change MemReqPtr parameters to references.
This avoids incrementing and decrementing the MemReq
reference counters on every call and return.

arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
cpu/exec_context.hh:
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
dev/alpha_console.cc:
dev/alpha_console.hh:
    Change MemReqPtr parameters to references.

--HG--
extra : convert_revision : 3ba18bdd9f996563988402576bfdd3430e1ab1e5
2004-02-02 10:47:21 -08:00
Steve Reinhardt 7c8413db10 Make stats:dump_period work even if dump_cycle isn't set.
--HG--
extra : convert_revision : 9e85c0fa0f6c5393dd8e91034a49975628cf825d
2004-02-02 07:19:45 -08:00
Andrew Schultz 60279bb67e Fixed the spec2000.ini file and made some cosmetic changes to the
setup-spec script

util/setup-spec:
    Made some changes so the information contained in the ini file explains
    what the init_param value corresponds to

--HG--
extra : convert_revision : 4082209f920244c262150c224a92ea21a55febd5
2004-01-30 17:38:25 -05:00
Andrew Schultz 74ae052b69 Added the spec2000 ini file
--HG--
extra : convert_revision : 981a5a536a25b07dd54ed0166b291876b0a498c0
2004-01-30 17:20:03 -05:00
Steve Raasch 2f4f7aacf7 major rework/rewrite of the breakdown script
--HG--
extra : convert_revision : 2e1d186e0f20b6089300b82a3f6dcb1d0b44c09d
2004-01-30 13:51:09 -05:00
Steve Reinhardt 7d64183b44 Use $(MAKE) instead of 'make' when building libelf (suppresses an error message about -j).
Check for, delete, and die on zero-length .d files.

--HG--
extra : convert_revision : 71b7f9e639d96fb7ed30952b142d69c34c725774
2004-01-30 09:16:34 -08:00
Steve Reinhardt e7e6717a1a Fix libelf generation so it works on a clean make -j.
--HG--
extra : convert_revision : 377633aa2c04695c598ee82a9529d2e40f0ffef7
2004-01-30 08:18:20 -08:00
Nathan Binkert 9374efa725 wrap debugging stuff with #ifdef DEBUG
--HG--
extra : convert_revision : 8205633c1c1b49b04f389aa40f95fbbc03a43fb6
2004-01-29 22:30:14 -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
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