Nathan Binkert [Tue, 4 Nov 2003 17:48:21 +0000 (12:48 -0500)]
fix type! argh
dev/etherlink.cc:
int -> Tick
--HG--
extra : convert_revision :
33c45ea306e6532b91d84018702b220b25de463e
Steve Reinhardt [Tue, 4 Nov 2003 04:35:05 +0000 (20:35 -0800)]
Automerge
--HG--
extra : convert_revision :
2ca18ecbf04a1de72391073d0a5309fdbbdfefda
Steve Reinhardt [Tue, 4 Nov 2003 04:31:15 +0000 (20:31 -0800)]
Fix bugs in and expand syscall emulation code.
arch/alpha/fake_syscall.cc:
Fix a couple of bugs:
- error return codes weren't making it through due to inadvertent cast to unsigned
- sigreturn broken in not one but two ways
- make all file descriptors look like plain files (not ttys)
Added implementations of setuid, getgid, fcntl, and getdirentries from Dave Oehmke
--HG--
extra : convert_revision :
53d3f13e1b05e3bde9e68ada3774ca39fa4c0d4c
Steve Reinhardt [Tue, 4 Nov 2003 04:26:51 +0000 (20:26 -0800)]
Minor changes to instruction trace output.
arch/alpha/isa_desc:
A few disassembly changes to make it easier to compare with old machine.def traces:
- Make lds prefetches print f31 instead of r31 as dest.
- Don't print mode suffixes on FP if SS_COMPATIBLE_DISASSEMBLY
cpu/exetrace.cc:
Left-justify instruction in field, and increase width by 1.
--HG--
extra : convert_revision :
9ffd56728f1bb772aa3ccda5f027b93d4c3a4135
Andrew Schultz [Mon, 3 Nov 2003 23:40:09 +0000 (18:40 -0500)]
Fix unserialize issues with etherdev (used to leave junk as callbacks which
would segfault)
--HG--
extra : convert_revision :
3b99b507c2df576622b9304215010bbfecedf8f1
Nathan Binkert [Mon, 3 Nov 2003 21:47:53 +0000 (16:47 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
2029fb26a8c971a791161c9e24dfdc1135f3aaf8
Nathan Binkert [Mon, 3 Nov 2003 21:47:08 +0000 (16:47 -0500)]
Make it so the quiesce instruction is conditionally enabled
arch/alpha/isa_desc:
move the quiesce instruction out of here so I can conditionally
enable it.
arch/alpha/pseudo_inst.cc:
conditionally enable quiesce
arch/alpha/pseudo_inst.hh:
add quiesce
--HG--
extra : convert_revision :
e1c474c4bf8761ff58073785d82b2bec9f632885
Ron Dreslinski [Mon, 3 Nov 2003 21:43:59 +0000 (16:43 -0500)]
Fix sampling cpu switchover of suspended contexts, and make some changes
to sampling config files to allow for different periods of the server and client
systems.
--HG--
extra : convert_revision :
ac4b6679266884d9bc3c20abb2a817f69873cc39
Andrew Schultz [Mon, 3 Nov 2003 21:29:32 +0000 (16:29 -0500)]
Fix etherdev so it serializes txPacket and rxPacket and fixes up the DmaRequest
correctly and remove previous serialization of DmaPhys
--HG--
extra : convert_revision :
65e919ceb573a7554c07947951a74ae321f0f4c0
Andrew Schultz [Mon, 3 Nov 2003 19:33:02 +0000 (14:33 -0500)]
Added serialization for DmaPhys structs and serialize DmaRequest::phys
--HG--
extra : convert_revision :
04f36fc5e6636c08ccb04d244a44017c7d0969ac
Ron Dreslinski [Mon, 3 Nov 2003 17:17:55 +0000 (12:17 -0500)]
Fix unserialize so that it still gos through the entire tree,
but warns if it doesn't find a section. Used to stop if a section
didn't exist, but it's children might still exist.
--HG--
extra : convert_revision :
d3f511b69bec26a80cb004d83c385df3de13f004
Ron Dreslinski [Mon, 3 Nov 2003 16:03:13 +0000 (11:03 -0500)]
Fix segfault from unserialization, add system_sample as a configuration
--HG--
extra : convert_revision :
41604400cb4b334dcffded44b77fa63658d8b096
Steve Reinhardt [Mon, 3 Nov 2003 05:49:15 +0000 (21:49 -0800)]
Print a warning rather than failing if we're unserializing and there's an
object in the config that was not in the checkpointed config.
This code compiles, but I haven't tested it... I'm committing it so Ron
can have it. Should not effect anything that currently works.
base/inifile.cc:
base/inifile.hh:
Add sectionExists() method so you can query whether a section exists
without knowing any of the entry names that would be in it.
sim/serialize.cc:
sim/serialize.hh:
Add Checkpoint::sectionExists() (pass through to IniFile).
--HG--
extra : convert_revision :
905db122afdfe55946ab8493ccac0b1e715bc7c6
Ron Dreslinski [Mon, 3 Nov 2003 04:20:50 +0000 (23:20 -0500)]
Merge zizzer:/m5/Bitkeeper/m5
into zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/unclean
--HG--
extra : convert_revision :
e142f9ad3528027accf9e03366357c006a9a1857
Nathan Binkert [Mon, 3 Nov 2003 03:12:20 +0000 (22:12 -0500)]
ok, let's get this right
arch/alpha/pseudo_inst.cc:
yes is not a real value, use true
--HG--
extra : convert_revision :
30b998ae6f13641d70c9158777a12b00df8742fe
Nathan Binkert [Mon, 3 Nov 2003 02:58:23 +0000 (21:58 -0500)]
Fix a bug in the pseudo instruction context
arch/alpha/pseudo_inst.cc:
Don't forget the descriptions
--HG--
extra : convert_revision :
f208ea24d5b34283e962916cb4c7dff976406285
Ron Dreslinski [Mon, 3 Nov 2003 01:56:41 +0000 (20:56 -0500)]
Merge zizzer:/m5/Bitkeeper/m5
into zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/unclean
--HG--
extra : convert_revision :
e388676c83f75c5f19d58b5ed42d41942ff5e2cb
Nathan Binkert [Mon, 3 Nov 2003 01:52:40 +0000 (20:52 -0500)]
Add the option to ignore some of the pseudo instructions
--HG--
extra : convert_revision :
2010782749ca9c5dd029f71480956b8a1fa96394
Nathan Binkert [Mon, 3 Nov 2003 01:43:39 +0000 (20:43 -0500)]
Move the m5 pseudo instructions into their own file
arch/alpha/isa_desc:
Move the pseudo instructions out of the isa_desc, into their own
file and call out to them when they're to be accessed
sim/sim_events.cc:
sim/sim_events.hh:
sim/sim_exit.hh:
move SimExit to sim_exit.cc
--HG--
extra : convert_revision :
1c393adb1c18bd0fef065057d7f4e9cf60ac4197
Ron Dreslinski [Mon, 3 Nov 2003 00:38:51 +0000 (19:38 -0500)]
Merge zizzer:/m5/Bitkeeper/m5
into zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/unclean
--HG--
extra : convert_revision :
40b955025db858628804bca3d0a155813ea81bf7
Ron Dreslinski [Mon, 3 Nov 2003 00:38:22 +0000 (19:38 -0500)]
General fixes for Sampling CPU in full system mode, and serialization of sampling CPU
cpu/intr_control.cc:
Fix the reference to the cpu, to look up which cpu is being used
In sampling mode can't use an absolute pointer to the cpu, use the
exeContexts vector
cpu/intr_control.hh:
Add two new functions to simplify MP interrupts, fix it for sampling CPU model
--HG--
extra : convert_revision :
a69cdbb81e6aefa3fd5385416713c689300bbea8
Steve Raasch [Mon, 3 Nov 2003 00:29:28 +0000 (19:29 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/y/sraasch/head
--HG--
extra : convert_revision :
f63c01cd6e002028879925e4c2c051de038f5e44
Steve Raasch [Mon, 3 Nov 2003 00:29:14 +0000 (19:29 -0500)]
Add binning support
--HG--
extra : convert_revision :
edb922d3a4422cedc5c0c7efbac7124b5184165f
Nathan Binkert [Sun, 2 Nov 2003 23:02:58 +0000 (18:02 -0500)]
Implement more m5 pseduo opcodes:
resetstats
dumpstats
dumpresetstats
m5checkpoint
Lots of cleanup of serialization and stats dumping/resetting to
work with these new instructions
arch/alpha/isa_desc:
Implement more m5 pseduo opcodes:
resetstats
dumpstats
dumpresetstats
m5checkpoint
All of these functions take two optional parameters, the first is a delay,
and the second is a period. The delay tells the simulator to wait the
specified number of nanoseconds before triggering the event, the period
tells the simulator to repeat the event with a specified frequency
base/statistics.cc:
base/statistics.hh:
regReset RegResetCallback
dev/disk_image.cc:
serializeFilename -> CheckpointFile()
sim/debug.cc:
Move this debugging statement to sim_stats.cc
sim/eventq.cc:
Don't AutoDelete an event if it is scheduled since the process()
function could potentially schedule the event again.
sim/main.cc:
DumpStatsEvent is now Statistics::SetupEvent(Dump, curTick)
sim/serialize.cc:
Change the serialize event so that it's possible to cause the
event to repeat. Also make the priority such that the event
happens just before the simulator would exit if both events
were scheduled for the same cycle.
get rid of the serializeFilename variable and provide a CheckpointFile()
function. This function takes a basename that is set in the
configuration, and appends the current cycle to the name so that
multiple checkpoints can be dumped from the same simulation.
Also, don't exit the simulation when a checkpoint file is dumped.
sim/serialize.hh:
serializeFilename -> CheckpointFile()
SetupCheckpoint function to tell the simulator to prepare
to checkpoint at a certain time with a certain period
sim/sim_events.cc:
DumpStatsEvent stuff gets move to sim_stats.(cc|hh)
The context stuff gets moved into the already existing
stats context in stat_context.cc
sim/sim_events.hh:
DumpStatsEvent stuff gets move to sim_stats.(cc|hh)
sim/universe.cc:
Provide some simple functions for converting times into
ticks. These use floating point math to get as close as
possible to the real values. Multipliers are set up ahead
of time
--HG--
extra : convert_revision :
d06ef26a9237529a1e5060cb1ac2dcc04d4ec252
Nathan Binkert [Sun, 2 Nov 2003 18:05:14 +0000 (13:05 -0500)]
Prevent make from being smart about sccs
--HG--
extra : convert_revision :
d9fdb32c87c8511aace91850867fc00d00855fe6
Nathan Binkert [Sun, 2 Nov 2003 18:01:08 +0000 (13:01 -0500)]
SimExit takes a time now
arch/alpha/isa_desc:
regen
--HG--
extra : convert_revision :
a9da9d2a5fc8a0414491e437747cde48dfb61a20
Nathan Binkert [Sun, 2 Nov 2003 07:13:04 +0000 (02:13 -0500)]
If a filter isn't specified, don't try to do any filtering
If pcap_lookupnet fails, just assume the netmask is 0xffffff00
that's all we really wanted from it anyway.
--HG--
extra : convert_revision :
ac0a390ddb7a6b0a4e4c6d2885bfa7bd059faf36
Nathan Binkert [Sun, 2 Nov 2003 07:07:31 +0000 (02:07 -0500)]
deprecate the m5exit instruction and rename it to m5exit_old
Implement a new m5exit instruction with an optional delay
arch/alpha/isa_desc:
move m5exit to m5exit old. The old version of the
instruction is now deprecated
Implement the new exit instruction with the optional delay
sim/sim_events.cc:
sim/sim_events.hh:
Make SimExit take a cycle
sim/universe.cc:
provide ticksPerMS, ticksPerUS, and ticksPerNS so we don't
have to do math during the cycle
--HG--
extra : convert_revision :
e2ed47a2e5cfcd57c82086c6fcb4a28bf801c214
Nathan Binkert [Sun, 2 Nov 2003 06:09:10 +0000 (01:09 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
7fd03e2b9f776bf035ad8c758aaf349c35cee47f
Nathan Binkert [Sun, 2 Nov 2003 06:08:59 +0000 (01:08 -0500)]
add several new functions that can be called from the guest
to tell the simulator to do something.
exit -> exit_old (deprecated
exit now takes an optional parameter that tells it to execute at a
specified time in the future
The next four functions have two optional parameters. The first
specifies a delay for how long to wait to issue the instruction.
The second will tell the simulator to repeat that command
at the specified interval.
checkpoint will trigger a checkpoint
dumpstats will cause the simulator to dump stats
resetstats will cause all stats to be reset
dumpreset will dump and reset stats
all times are in nanoseconds
util/m5/Makefile:
Clean up to make it a bit easier to muck with
util/m5/m5.c:
Add a bunch of new commands and clean up the command parsing path
Convert atoi to strtoul so that we can use 64bit numbers and even
hex if we want to. (this runs on alpha, so a long is 64bit)
util/m5/m5op.h:
add prototypes for new m5 instructions
use uint64_t since it's nicer
--HG--
extra : convert_revision :
664ff00f0f0dfc5263c4e873d82fd9996a4521e9
Lisa Hsu [Sun, 2 Nov 2003 06:07:43 +0000 (01:07 -0500)]
iqueue.cc:
don't clear stat fullCount in the constructor for iq.
it comes cleared.
--HG--
extra : convert_revision :
80e09cfbdebd67615892cd1178bb0f8cfb5fc04f
Nathan Binkert [Sun, 2 Nov 2003 05:35:40 +0000 (00:35 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
8f2ced105b0a14bd4b0c0b52ed9c7b1c2ddc6e18
Nathan Binkert [Sun, 2 Nov 2003 05:35:31 +0000 (00:35 -0500)]
Add basic.ini which is a barebones system that has nothing
disk1.ini provides #defines that can be set to configure a second disk
--HG--
extra : convert_revision :
0997063cd97dd66aea36402712998f65e23714b3
Ron Dreslinski [Sun, 2 Nov 2003 04:03:17 +0000 (23:03 -0500)]
Merge zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/clean
into zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/unclean
--HG--
extra : convert_revision :
89cecb54210ad4ec1b5062f091d7355b18b324e6
Ron Dreslinski [Sun, 2 Nov 2003 04:00:40 +0000 (23:00 -0500)]
Fix overwritting and ordering issues with serialization routines
dev/disk_image.cc:
seperate serialization output files for different cow images
--HG--
extra : convert_revision :
b62551f8e3f6315bb92ae3cb44e077d8084cbfe7
Lisa Hsu [Sat, 1 Nov 2003 23:17:46 +0000 (18:17 -0500)]
statistics.hh:
add enum to Bin::VectorBin
base/statistics.hh:
add enum to Bin::VectorBin
--HG--
extra : convert_revision :
a05aef30ca85bf5c0d1f5155e1dff3fb34fd7777
Nathan Binkert [Sat, 1 Nov 2003 22:53:39 +0000 (17:53 -0500)]
Factor out the client/server network part into its own
.ini file that we #include and add a DUMPFILE option
for dumping a ethertrace
--HG--
extra : convert_revision :
96fec0710a6f788890f3764e4ef078d53723c6dd
Nathan Binkert [Sat, 1 Nov 2003 21:26:19 +0000 (16:26 -0500)]
gah! how did this ever work? time uses Tick, not unsigned!
--HG--
extra : convert_revision :
caf246d12be97988573d4775325a41ff94c9afe1
Nathan Binkert [Sat, 1 Nov 2003 19:11:29 +0000 (14:11 -0500)]
Licenses
--HG--
extra : convert_revision :
ce47fdfaa5c59480a1fb38d86eed7d16ab7b5fc1
Steve Reinhardt [Sat, 1 Nov 2003 18:59:06 +0000 (10:59 -0800)]
Make error messages more informative on a non-full-system fault.
base/misc.cc:
Add curTick to panic and warn messages.
Reformat fatal message a bit for consistency.
--HG--
extra : convert_revision :
171da2fe6ca5e25982058ee1af67473292659103
Nathan Binkert [Sat, 1 Nov 2003 18:53:23 +0000 (13:53 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
3536754864ead5d7c95a2a8a1b6edd2fb70f5a88
Nathan Binkert [Sat, 1 Nov 2003 18:53:08 +0000 (13:53 -0500)]
.cvsignore files don't really do anything for us anymore, so
let's make bitkeeper ignore the stuff.
--HG--
extra : convert_revision :
8ea2a403c7ba2a3c9bd44269a2c0ede9294c92d4
Steve Reinhardt [Sat, 1 Nov 2003 18:45:23 +0000 (10:45 -0800)]
Get rid of obsolete backtrace code.
--HG--
extra : convert_revision :
3f5b938e0f64fac5e1c060d82d7f6906521b2174
Nathan Binkert [Sat, 1 Nov 2003 18:20:44 +0000 (13:20 -0500)]
Commit a command for use inside a simulated system for communicating
with the simulator. This program is generally compiled as the name
m5 and installed in /usr/local/bin
This command uses opcodes that are invalid on a normal system, so
don't expect it to do anything on a real system.
--HG--
extra : convert_revision :
fcbae99d4b0d38ff4a9950f1ab53923baa1f667a
Andrew Schultz [Sat, 1 Nov 2003 03:09:18 +0000 (22:09 -0500)]
eventq.cc, eventq.hh:
Cleaned up serialization
sim/eventq.hh:
sim/eventq.cc:
Cleaned up serialization
--HG--
extra : convert_revision :
b75696d75f1aee16ebca2076fdd3cd4913593762
Andrew Schultz [Fri, 31 Oct 2003 23:38:52 +0000 (18:38 -0500)]
Fix mistake, used readRequest.name twice
--HG--
extra : convert_revision :
0f8fa5f5487223c78402af79b42cf18f7b5022c0
Nathan Binkert [Fri, 31 Oct 2003 23:28:05 +0000 (18:28 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zans/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
3134761fa4c572a672558dfb6f9252aaef7b7062
Nathan Binkert [Fri, 31 Oct 2003 23:27:17 +0000 (18:27 -0500)]
Make the to_number function work better.
base/str.cc:
Make some fixes for the to_number function.
Fix overflow calculation for maximum decimal value.
(Note: minimum decimal value for signed numbers does not
work correctly, e.g. it will overflow on -128 for a signed char
though -127 will work)
Fix overflow calculation for hex values being converted into
signed types
Fix up the debugging stuff a little to make sure the values are
always printed as numbers.
test/strnumtest.cc:
using namespace std for g++ 3
--HG--
extra : convert_revision :
b00bb1296c85c3d64d8864283c9374e1563bfa31
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