Commit graph

574 commits

Author SHA1 Message Date
Erik Hallnor
9c7bec74b1 Separate template definitions and instantiations into *_impl.hh and *.cc. Eventually the *.cc fils should be generate by our super-duper python script.
base/compression/null_compression.hh:
    Need some includes.

--HG--
extra : convert_revision : caf52320f6f6ff255e8a93817419ad13ad44224f
2004-02-08 17:26:27 -05:00
Nathan Binkert
de285ff2a0 Totally rework the Range class. Now the range is from [start, end)
to be consistent with the way that the stl works.  It also makes
lots of other stuff easier.  (Maybe those guys were smart?)
Overload the various comparison operators so that you can test
for overlapping of ranges, etc.

base/range.hh:
    Totally rework the Range class.  Now the range is from [start, end)
    to be consistent with the way that the stl works.  It also makes
    lots of other stuff easier.  (Maybe those guys were smart?)
    Overload the various comparison operators so that you can test
    for overlapping of ranges, etc.

    make parse function private and offer operator= instead
    isValid -> valid
    and for you erik, I add comments
test/Makefile:
    add range.o
test/rangetest.cc:
    better tests

--HG--
extra : convert_revision : dd58720aa3d02f20b03e933f2eaa3320c82bb27a
2004-02-07 01:16:50 -05:00
Nathan Binkert
6d6c91f756 formatting
--HG--
extra : convert_revision : 0cea17bd3a517a1838006d89fac8a923e4576394
2004-02-06 19:47:19 -05:00
Nathan Binkert
8a89f8c807 Small cleanup
--HG--
extra : convert_revision : 92f6dbd3d2c4336a0f03a9da5c390a7980ca08be
2004-02-06 18:59:12 -05:00
Erik Hallnor
bdfb5de4b2 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 158117a2cba91b8cb04f41a418155149bcbba777
2004-02-06 00:13:44 -05:00
Erik Hallnor
8f0060b4ae Various extraction of common code into separate functions to make life easier.
--HG--
extra : convert_revision : ae303904e35975e65b4207f543ac93c9816e1f81
2004-02-06 00:13:26 -05:00
David Oehmke
95c248c213 Modify the emulated system calls to support running the SPEC Int
benchmarks for alpha-linux.

arch/alpha/alpha_linux_process.cc:
    Added some more ioctl commands to ignore.
    Set unlink and rename to the new functions.
    Ignore setrlimit, times and rt_sigaction.
    Should eventually provide a function for times.
arch/alpha/alpha_tru64_process.cc:
    Added some more ioctl commands to ignore.
    Set unlink and rename to the new functions.
    Ignore setrlimit.
sim/syscall_emul.cc:
    Added implementations for unlink and rename.
sim/syscall_emul.hh:
    Added unlink and rename functions.
    Added a couple more ioctl requests to ignore.
    Print out the PC of any ioctl commands that fail.

--HG--
extra : convert_revision : 8af21c7fa7d0645d3f9324c9ce70ad33590c3c8e
2004-02-05 12:16:17 -05:00
Steve Reinhardt
b6ff600bca Add support for "serializing" instructions that flush
execution pipeline (Alpha trapb & excb).

Add support for write memory barriers (mostly impacts
store buffer).

Add StaticInst flag to indicate memory barriers, though
this is not modeled in the pipeline yet.

arch/alpha/isa_desc:
    Implement trapb, excb, mb, and wmb as insts with
    no execution effect (empty execute() function) but
    with flags that indicate their side effects.

    Also make sure every instruction that needs to go to
    the execute stage has a real opClass value, since we
    are now using No_OpClass to signal insts that can get
    dropped at dispatch.

    StaticInst::branchTarget() is now a const method.
cpu/static_inst.hh:
    Add flags to indicate serializing insts (trapb, excb) and
    memory and write barriers.

    Also declare some StaticInst methods as const methods.
dev/etherlink.hh:
sim/eventq.hh:
sim/serialize.cc:
sim/serialize.hh:
sim/sim_object.hh:
    Make name() return value const.

--HG--
extra : convert_revision : 39520e71469fa20e0a7446b2e06b494eec17a02c
2004-02-04 21:42:00 -08:00
Erik Hallnor
f2af9be29e Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 2f3653bbd0ab20308dcff5db176dc926402e9ad7
2004-02-04 16:55:17 -05:00
Erik Hallnor
2d6db0359e Change IIC to use param class. Tweak parameters in CacheTags.
--HG--
extra : convert_revision : 8239a7befe49c81b6b1f239fc478910441f64352
2004-02-04 16:55:05 -05:00
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
Erik Hallnor
56bb8ec48d Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : e94049f2b2dfbd2f1a018ddd6c05a4882d0f4a82
2004-02-03 12:58:34 -05: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
Erik Hallnor
16bb300586 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 0cceed934a4f44c27c8293780fc927ef2c00869d
2004-02-02 14:11:59 -05:00
Erik Hallnor
423d858061 Change the way the IIC way list is handled in the primary table.
--HG--
extra : convert_revision : 476f738d59446bdc43d1bd67950aac310b22a42c
2004-02-02 14:10:24 -05: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
Erik Hallnor
9c1ac8b583 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 3d84d17bc48ad23edf97e53a096821318741d775
2004-01-30 14:20:32 -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
Erik Hallnor
482d3d5267 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : c03206291cfa9abd80b8ee3f2f0135eb23d10242
2004-01-29 22:47:54 -05:00
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