Andrew Schultz [Fri, 31 Oct 2003 23:05:12 +0000 (18:05 -0500)]
Merge zizzer:/bk/m5
into ascender.eecs.umich.edu:/.automount/zizzer/z/alschult/sandbox/m5-change
--HG--
extra : convert_revision :
1ce2a98c531502cbf0c8eb4b365f14a893dc0f5d
Andrew Schultz [Fri, 31 Oct 2003 23:05:00 +0000 (18:05 -0500)]
Serialization support for serializing between DmaHolder simobjects and DmaEngine
--HG--
extra : convert_revision :
85de62b4066595a3139029a6ccc1c1e84526a0be
Andrew Schultz [Fri, 31 Oct 2003 22:32:04 +0000 (17:32 -0500)]
Changed the naming of Serializeable derived objects. Serializeable no longer has
objName as a member, instead it has the pure virtual function name(). SimObject
now has a objName member, and all classes derived directly from Serializeable
have to implement a name() function (which now makes them unique by pointer value)
cpu/simple_cpu/simple_cpu.cc:
Change initialization of Event to get rid of Serializeable naming
dev/etherlink.cc:
dev/etherlink.hh:
Seralizeable derived naming changes
sim/eventq.cc:
Serializeable derived naming changes, also changed serialization process so it
doesn't need to use nameChildren
sim/eventq.hh:
Serializeable derived naming changes, remove constructor for specifying event name
sim/serialize.cc:
Serializeable derived naming changes, remove setName function and the child naming
pass for serialization
sim/serialize.hh:
Serializeable derived naming changes, removed nameChildren, setName
sim/sim_object.cc:
sim/sim_object.hh:
Serializeable derived naming changes
--HG--
extra : convert_revision :
67bcc275b6c210f7049f98a1ad0d22e8f5596a63
Steve Reinhardt [Fri, 31 Oct 2003 18:10:45 +0000 (10:10 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
6a2131478dcc1965313d51436613cf48d85af524
Steve Reinhardt [Fri, 31 Oct 2003 18:10:34 +0000 (10:10 -0800)]
New 'greprevs' script to grep through old revs of a file.
util/greprevs:
Add descriptive comment.
--HG--
extra : convert_revision :
4fffef1327c04bdae7c7151db405920e2cc4eec8
Lisa Hsu [Fri, 31 Oct 2003 05:23:53 +0000 (00:23 -0500)]
I forgot - also to typedef the default type of bin choice given to every visible stat type (NoBin or BinType). this way a little #define does it all for you.
statistics.hh:
add #includes needed for CeilPow2
statistics.cc:
rm unneeded #includes for CeilPow2
base/statistics.cc:
rm unneeded #includes for CeilPow2
base/statistics.hh:
add #includes needed for CeilPow2
--HG--
extra : convert_revision :
818028b276e97735a8b8d21d6514f41a80350514
Lisa Hsu [Fri, 31 Oct 2003 00:20:18 +0000 (19:20 -0500)]
statistics.hh:
oops - remove a debug printf
base/statistics.hh:
oops - remove a debug printf
--HG--
extra : convert_revision :
a6ecab93f79ce0a5cb6ff129750d8f6a2de8d38c
Lisa Hsu [Fri, 31 Oct 2003 00:18:53 +0000 (19:18 -0500)]
Make some general changes to stats package where things either could have been better or were just plain wrong.
statistics.hh:
fix a bug in binning that made bins a fixed size no matter what. add GenBin class that is public but not templatized.
statistics.cc:
change map to statMap so others can use the map<> token without needing ::. also, add a level of GenBin that is public base class for StatBin<>.
base/statistics.cc:
change map to statMap so others can use the map<> token without needing ::. also, add a level of GenBin that is public base class for StatBin<>.
base/statistics.hh:
fix a bug in binning that made bins a fixed size no matter what. add GenBin class that is public but not templatized.
--HG--
extra : convert_revision :
6976a891e414c9515cc5a613157f7cb86ef89008
Ron Dreslinski [Thu, 30 Oct 2003 22:45:23 +0000 (17:45 -0500)]
Fix initial state of dmaDoneCB and bufferCB for serialization
--HG--
extra : convert_revision :
dbe5a98515c64f378cb52469a3121b6f51275646
Ron Dreslinski [Thu, 30 Oct 2003 21:48:23 +0000 (16:48 -0500)]
Serialization support for cow images
dev/disk_image.cc:
dev/disk_image.hh:
Serialization of cow images
--HG--
extra : convert_revision :
144179b8cad00b32df8c448a8556a465e24737aa
Steve Raasch [Thu, 30 Oct 2003 20:16:05 +0000 (15:16 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/y/sraasch/serialize
--HG--
extra : convert_revision :
ebb65c27685394826efc265bcc674577395e0963
Steve Raasch [Thu, 30 Oct 2003 20:16:00 +0000 (15:16 -0500)]
Add serialization (which Nate now says we probably don't need)
--HG--
extra : convert_revision :
e075fafdf6e72a424110a120e24ca71cb44cfb03
Steve Raasch [Thu, 30 Oct 2003 20:15:27 +0000 (15:15 -0500)]
Add support for serialization
--HG--
extra : convert_revision :
ff6c93ee2f4e6aeb5a824958c52f62d6c2a1cdfd
Erik Hallnor [Thu, 30 Oct 2003 20:09:29 +0000 (15:09 -0500)]
Finish serializing ScsiDisk and DmaRequest
--HG--
extra : convert_revision :
655e50d7ef9b25a054b8069f0a20076659457fea
Erik Hallnor [Thu, 30 Oct 2003 20:08:45 +0000 (15:08 -0500)]
runAddrLast and runDataLast shouldn't be stats
--HG--
extra : convert_revision :
136673e6a4c0db57b2b0a12fe68e5a04eebfeadf
Steve Raasch [Thu, 30 Oct 2003 16:47:21 +0000 (11:47 -0500)]
Add support for serialization
base/pollevent.hh:
Add queued() member function to indicate if this event has been queued
--HG--
extra : convert_revision :
bebb04dc8e10c1043e55e0036806bd1ca4fec167
Erik Hallnor [Thu, 30 Oct 2003 16:38:08 +0000 (11:38 -0500)]
Fix doxygen warnings from the change to Checkpoint.
--HG--
extra : convert_revision :
31120c27c42b34f62d2c0b7dde0e6d6bf9f04619
Steve Raasch [Thu, 30 Oct 2003 15:44:55 +0000 (10:44 -0500)]
Merge previous changes with format change
--HG--
extra : convert_revision :
1c34c9a81311422085e5ba23edea08e3997e9419
Steve Reinhardt [Thu, 30 Oct 2003 15:19:47 +0000 (07:19 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
0bd243f9c3d69d260ca25d0738e730e63c784878
Steve Raasch [Thu, 30 Oct 2003 15:13:10 +0000 (10:13 -0500)]
Fix/finish serialization
--HG--
extra : convert_revision :
43160ad0d3f5ea4dbf2a628a60db0ebe805b5203
Steve Reinhardt [Thu, 30 Oct 2003 15:08:35 +0000 (07:08 -0800)]
Add some comments explaining ExecContext::Status enum.
cpu/exec_context.hh:
Add some comments explaining Status enum.
--HG--
extra : convert_revision :
87fdb5d9c09d2a08ab0cff9fa38da2579a550477
Steve Reinhardt [Thu, 30 Oct 2003 15:02:37 +0000 (07:02 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk2/m5
--HG--
extra : convert_revision :
a4c2b6366b75f2561af672916e56c0c7fea14085
Steve Reinhardt [Thu, 30 Oct 2003 15:01:46 +0000 (07:01 -0800)]
New tracediff script for invoking rundiff on two copies of the simulator.
--HG--
extra : convert_revision :
a399fd95fe57a3f9247a2675c363e6d3cc953a7e
Steve Reinhardt [Thu, 30 Oct 2003 06:22:03 +0000 (22:22 -0800)]
Get rid of lots of obsolete mentions of stat_sdb_t.
base/predictor.hh:
base/sat_counter.hh:
sim/param.hh:
Get rid of spurious references to stat_sdb_t.
--HG--
extra : convert_revision :
0018a940c69b6e31b85fd85354b9d5ce2fd0aa6f
Steve Reinhardt [Thu, 30 Oct 2003 06:13:16 +0000 (22:13 -0800)]
Merge Steve & Erik's etherdev & scsi changes with mine (specifically
new arg type for unserialize()).
dev/etherpkt.hh:
unserialize() takes Checkpoint* instead of IniFile* now.
--HG--
extra : convert_revision :
21b9d97350a591b0f95d84f6c0cfcdfa0b28d714
Steve Reinhardt [Thu, 30 Oct 2003 05:50:28 +0000 (21:50 -0800)]
Merge.
--HG--
extra : convert_revision :
1552730090e0904fbc4e4c8f515b306355cb66f3
Steve Reinhardt [Thu, 30 Oct 2003 05:45:39 +0000 (21:45 -0800)]
Support for Serializable non-SimObject things like events.
Can now serialize & unserialize DmaRequestEvents and DmaTransferEvents.
Also support serialize/unserialize of pointers to SimObjects and
other Serializable objects.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
arch/alpha/isa_traits.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.hh:
dev/alpha_access.h:
dev/alpha_console.cc:
dev/alpha_console.hh:
dev/console.cc:
dev/console.hh:
unserialize() now takes a Checkpoint* instead of an IniFile*.
cpu/simple_cpu/simple_cpu.cc:
unserialize() now takes a Checkpoint* instead of an IniFile*.
Put ExecContext in its own section so its _status fields doesn't conflict.
sim/eventq.cc:
sim/eventq.hh:
unserialize() now takes a Checkpoint* instead of an IniFile*.
Events get serialized by the event queue only if they're marked
as AutoSerialize... others are assumed to be serialized by something
else (e.g. an owning SimObject) or to not matter.
sim/param.cc:
Shift 'const' in case T is a ptr type.
sim/serialize.cc:
sim/serialize.hh:
Define Checkpoint object to encapsulate everything you need to know
about a checkpoint. Use it to allow lookups of named Serializable
objects (and SimObjects) during unserialization.
unserialize() now takes a Checkpoint* instead of an IniFile*.
--HG--
extra : convert_revision :
8e6baab32405f8f548bb67a097b2f713296537a5
Erik Hallnor [Thu, 30 Oct 2003 05:03:31 +0000 (00:03 -0500)]
scsi_disk.cc:
Serialize data as an array, more compact
--HG--
extra : convert_revision :
fb0d46e27b7fa976bb6afa4fdb41c981bd2b0fba
Erik Hallnor [Thu, 30 Oct 2003 04:30:19 +0000 (23:30 -0500)]
Serialization and documentation.
--HG--
extra : convert_revision :
c9345685e08587b4dabd5ad04ea808711b42db41
Steve Raasch [Thu, 30 Oct 2003 01:25:03 +0000 (20:25 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/y/sraasch/serialize
--HG--
extra : convert_revision :
5fab5b232026a2262e25b7eea4ede9b72d8c86ec
Steve Raasch [Thu, 30 Oct 2003 01:24:47 +0000 (20:24 -0500)]
Add serialization for etherdev
These changes don't seem to break anything, and may even be correct.
dev/etherpkt.hh:
Add serialization
--HG--
extra : convert_revision :
02962b9bef01c1c3f35a095788117bd95e7ed4bc
Steve Reinhardt [Wed, 29 Oct 2003 22:46:12 +0000 (14:46 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG--
extra : convert_revision :
4a94a6200bb5fb38983ae785d3fb20f2a3dd8fe7
Steve Reinhardt [Wed, 29 Oct 2003 22:43:04 +0000 (14:43 -0800)]
Add license to new isa_traits.cc file.
--HG--
extra : convert_revision :
fe7346e509c063d72def2298fa997fdec14b60be
Lisa Hsu [Wed, 29 Oct 2003 22:29:37 +0000 (17:29 -0500)]
bus.cc:
don't need to clear these stats runAddrLast and runDataLast in the bus constructor, since stats are automatically cleared on creation.
--HG--
extra : convert_revision :
a6ee5e5779e2b854c6b78dabfa4ed99978cbc41a
Steve Reinhardt [Wed, 29 Oct 2003 22:25:17 +0000 (14:25 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG--
extra : convert_revision :
f5ca2dfe3524e40f9d9db2b01e1846014dfb9a6f
Erik Hallnor [Wed, 29 Oct 2003 22:18:33 +0000 (17:18 -0500)]
Use the correct definition of the max DMA pages
--HG--
extra : convert_revision :
ab5221605d28cbb3d0159bc8c5da17c5bfda66b4
Steve Reinhardt [Wed, 29 Oct 2003 21:35:18 +0000 (13:35 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG--
extra : convert_revision :
abe99bd7f4632eea51fba97273ac024f81b0ddae
Steve Reinhardt [Wed, 29 Oct 2003 21:35:07 +0000 (13:35 -0800)]
Serialization support for Alpha TLBs, PhysicalMemory, and SimpleCPU.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
Serialize TLB contents.
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
Complete serialization of SimpleCPU (including owned events).
sim/eventq.cc:
sim/eventq.hh:
Basic serialization for events.
Still need to handle dynamic events (not owned by a SimObject).
sim/serialize.cc:
sim/serialize.hh:
Export serialization filename so PhysicalMemory can
derive its filename from that.
--HG--
extra : convert_revision :
4db851c5880f73f576ca092d5e5ad4256048eb51
Erik Hallnor [Wed, 29 Oct 2003 21:25:23 +0000 (16:25 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
9497a4015940e7fb7151e09f70e84134458ee877
Erik Hallnor [Wed, 29 Oct 2003 21:25:08 +0000 (16:25 -0500)]
Clear up doxygen warnings and serialize ScsiCtrl. We probably shouldn't decfine functions using type defs ala "RegFile" instead of "AlphaISA::RegFile".
base/inifile.hh:
Document findAppend
--HG--
extra : convert_revision :
ab5047590b3ca2a9126b75351e4902d300b5b5ad
Andrew Schultz [Wed, 29 Oct 2003 19:37:34 +0000 (14:37 -0500)]
Checkpointing support for all the tlaser_* files and Turbolaser
--HG--
extra : convert_revision :
a7c6cba25713ff334fb9a402817566bfb5eb6679
Nathan Binkert [Wed, 29 Oct 2003 18:06:34 +0000 (13:06 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
97a3b844f3b2f5dcb1e9add4080d5dffebba22c0
Nathan Binkert [Wed, 29 Oct 2003 17:46:31 +0000 (12:46 -0500)]
Make the ethernet device use only 32bit and 64bit accesses
This change requires an update of the es device driver in
the kernel as well.
--HG--
extra : convert_revision :
83b83570b8c487869c7bfc550dceb3672d19da10
Steve Reinhardt [Wed, 29 Oct 2003 16:50:25 +0000 (08:50 -0800)]
Flesh out ExecContext serialize/unserialize (including RegFile).
Add support for serializing enums.
arch/alpha/isa_traits.hh:
Add serialize/unserialize functions for RegFile
(defined in new isa_traits.cc).
cpu/exec_context.cc:
Flesh out serialize/unserialize.
sim/serialize.hh:
Add {UN}SERIALIZE_ENUM().
--HG--
extra : convert_revision :
9e30c7e7b3b290dc8ea0888ba3636fc93ee89052
Steve Reinhardt [Wed, 29 Oct 2003 08:46:26 +0000 (00:46 -0800)]
Rename SERIALIZE_MEMBER to SERIALIZE_SCALAR.
--HG--
extra : convert_revision :
848cfcf3323d224cdb2ff14df6f6996607a5c27f
Steve Reinhardt [Wed, 29 Oct 2003 08:41:24 +0000 (00:41 -0800)]
More progress on checkpointing... we can now write out a checkpoint and read it back in,
though most objects don't actually serialize any data.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
arch/alpha/isa_traits.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.hh:
dev/alpha_access.h:
dev/alpha_console.cc:
dev/alpha_console.hh:
dev/console.cc:
dev/console.hh:
Change unserialize param from IniFile& to const IniFile*.
cpu/simple_cpu/simple_cpu.cc:
Change unserialize param from IniFile& to const IniFile*.
Make unserialize call ExecContext::unserialize.
sim/eventq.cc:
Rename MainEventQueue (no spaces) for easier parsing in checkpoints.
Disable event serialization for now, so we can focus on the easy stuff.
sim/serialize.cc:
Change paramIn and arrayParamIn param from IniFile& to const IniFile*.
sim/serialize.hh:
Change unserialize, paramIn, and arrayParamIn params from IniFile& to const IniFile*.
--HG--
extra : convert_revision :
6e8853ed375eddec0e140c95a01dd51bd225f7b9
Steve Reinhardt [Wed, 29 Oct 2003 07:24:40 +0000 (23:24 -0800)]
Add a few configuration DPRINTFs.
Fix handling of chars (uint8_ts) in serialization.
Minor cleanup.
sim/param.cc:
Add specialization of showParam for char: output as ints, not as characters.
Clean up comments a bit.
--HG--
extra : convert_revision :
96349382447d892679dda9f83c028eec64252dc0
Steve Reinhardt [Wed, 29 Oct 2003 01:48:10 +0000 (17:48 -0800)]
Get new serialization code to link.
sim/param.cc:
Convert parseParam() and showParam() to templates,
andd explicitly instantiate them for common types.
sim/param.hh:
Add declarations for parseParam() and showParam() function templates,
so serialize.cc can use them.
sim/serialize.cc:
Don't need declarations for parseParam() and showParam() since
we put them in param.hh.
Also instantiate paramOut() etc. for bool.
--HG--
extra : convert_revision :
1d84d0fbec64481996cbfa8b84c67c13c6244385
Steve Reinhardt [Tue, 28 Oct 2003 20:56:17 +0000 (12:56 -0800)]
Merge zizzer:bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG--
extra : convert_revision :
50aa3791d27a17c4ea2fb4aee1a67011bd2abec1
Steve Reinhardt [Tue, 28 Oct 2003 20:55:12 +0000 (12:55 -0800)]
Revamp serialization to make it easier.
--HG--
extra : convert_revision :
c57a538d7cf606dbdf5fa244f92da46bd830e335
Steve Reinhardt [Tue, 28 Oct 2003 17:09:45 +0000 (09:09 -0800)]
Clean up a few spots where we weren't handling of misspeculation correctly.
arch/alpha/ev5.cc:
Don't call kernelStats.hwrei() or system->breakpoint() on misspeculated paths.
arch/alpha/isa_desc:
Don't write reegs.intrflag, do Annotate::Callpal, or call xc->syscall
on misspeculated paths.
--HG--
extra : convert_revision :
e73b96fbe4ac5be85fb20aa218fd05fd56d5b2f3
Nathan Binkert [Tue, 28 Oct 2003 15:05:58 +0000 (10:05 -0500)]
emulate callpal halt for non FULL_SYSTEM
in the process make m5_exit more generic
arch/alpha/ev5.cc:
arch/alpha/ev5.hh:
There's no reason that this needs to be in an arch specific file
arch/alpha/isa_desc:
m5_exit -> SimExit
Emulate callpal halt and cause the simulator to exit
while we're at it, sort #includes
sim/sim_events.cc:
sim/sim_events.hh:
move the m5_exit function here, renaming it to SimExit.
Also Allow the caller to pass in the termination message.
--HG--
extra : convert_revision :
54b43b17a412ab387b8672c27ef0b04fce10ee15
Nathan Binkert [Tue, 28 Oct 2003 00:58:37 +0000 (19:58 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
df464a46539df4d4870e1e1118bd1a566efe19a0
Andrew Schultz [Mon, 27 Oct 2003 19:43:05 +0000 (14:43 -0500)]
Added init_param line to specweb.ini
--HG--
extra : convert_revision :
1453fae160867ed3e111561eeb71fe0ac2dd6a82
Erik Hallnor [Mon, 27 Oct 2003 19:29:42 +0000 (14:29 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
782be2a26c1d0a416ff75bbc80cca5760b467fab
Erik Hallnor [Mon, 27 Oct 2003 19:29:09 +0000 (14:29 -0500)]
Add an exit condition for a set number of misses in any cache. Add writebacks into the overall cache statistics.
--HG--
extra : convert_revision :
76f460f5b7729fc6b85d465d8e21a7a249239a81
Nathan Binkert [Mon, 27 Oct 2003 18:01:25 +0000 (13:01 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
6b53813ed7ee4266ad716df5844070a72977341b
Nathan Binkert [Mon, 27 Oct 2003 17:58:47 +0000 (12:58 -0500)]
Add a strip target that will create m5.strip (a stripped
version of m5.opt)
--HG--
extra : convert_revision :
48a1542fb1b62804c59e68b7fed083c4eff03a20
Steve Reinhardt [Mon, 27 Oct 2003 07:03:51 +0000 (23:03 -0800)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
25f6c41b709b4dabe1a2e0a180508db05aa4263f
Nathan Binkert [Mon, 27 Oct 2003 07:02:37 +0000 (02:02 -0500)]
specweb.ini:
fix system name
--HG--
extra : convert_revision :
ce7438e314a829c102409c6164006712456c3b2b
Steve Reinhardt [Mon, 27 Oct 2003 06:38:53 +0000 (22:38 -0800)]
Minor serialization tweaks.
cpu/simple_cpu/simple_cpu.cc:
Serialize FP regs as integers (so we get exact bit representation).
sim/serialize.cc:
Don't panic on object rename... events come up named "event"
and need to get renamed. Also fix some DPRINTFs.
--HG--
extra : convert_revision :
62ad527a7aaf78ae623b70febc1331cf91cbad05
Steve Reinhardt [Mon, 27 Oct 2003 06:37:14 +0000 (22:37 -0800)]
Fix some problems with stats reset & floss counters.
arch/alpha/isa_desc:
Keep m5 pseudo-instructions (like resetstats) from taking effect
on misspeculated paths.
--HG--
extra : convert_revision :
7f0b0490164bca377ff2b14abc35a6c26bac9e6d
Nathan Binkert [Mon, 27 Oct 2003 04:04:17 +0000 (23:04 -0500)]
Clean up kernel .ini files. Factor out common stuff and use
#include to do stuff.
--HG--
extra : convert_revision :
65f2ad04f756cf3fdfe24620a13b04143bf660e0
Nathan Binkert [Mon, 27 Oct 2003 03:42:45 +0000 (22:42 -0500)]
Add an append= keyword that works in a somewhat similar way to
default=. In the append= case, when looking up an entry, it also
looks in the section named by the append= for something to append
to the entry
--HG--
extra : convert_revision :
b51915094ad3ca151d7f241c29e19b6b29d3a3c0
Nathan Binkert [Mon, 27 Oct 2003 03:40:03 +0000 (22:40 -0500)]
Make the tap work work again
util/tap/Makefile:
Make this stuff compile again
util/tap/tap.cc:
clean up some of the error messages
--HG--
extra : convert_revision :
4543d946b48c9e07bf19b812db6466f80ed6b851
Nathan Binkert [Mon, 27 Oct 2003 03:38:26 +0000 (22:38 -0500)]
only send data to a peer if the peer exists
dev/etherint.hh:
only send data to the peer if there is a peer
--HG--
extra : convert_revision :
33d90679ed91a2b2842ce4155ac4e58ec3defc22
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
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
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
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
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
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
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
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
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
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
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
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
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
Andrew Schultz [Fri, 24 Oct 2003 18:57:24 +0000 (14:57 -0400)]
Added new ini file for specwebssl
--HG--
extra : convert_revision :
df7fa6244f9a5a0660c9b5b30974b8544d12edcd
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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