Nathan Binkert [Fri, 30 Jul 2004 14:47:53 +0000 (10:47 -0400)]
Move all of the object matching code to a shared file so it can
be more easily re-used. This currently uses some cooked up matching
function that I wrote a while ago, but should probably be changed
to use regular expressions in the future.
add doDebugBreak to control breakpoints on a per SimObject basis
SConscript:
add match
base/stats/events.cc:
base/trace.cc:
Move the object matching code into a separate file so it can be
more easily shared
base/trace.hh:
the object matching code was wrapped up and moved. adapt.
sim/sim_object.cc:
add the doDebugBreak flag that can be set on a per-SimObject
basis. This will be used in the future to control whether or
not debug_break() will actually break for a given object.
provide a function interface that can be called from the debugger.
sim/sim_object.hh:
add the doDebugBreak flag that can be set on a per-SimObject
basis. This will be used in the future to control whether or
not debug_break() will actually break for a given object.
--HG--
extra : convert_revision :
6bf7924de63d41f5ba6b80d579efdf26ba265a8f
Nathan Binkert [Fri, 30 Jul 2004 14:18:04 +0000 (10:18 -0400)]
Make the DDUMP tracing feature output the cycle number and
the object name on every line.
This makes grep a bit more effective.
kern/tru64/dump_mbuf.cc:
use the new data dump format that trace.hh now provides
--HG--
extra : convert_revision :
179efa96aaff9da710baae13c9e981975d2abdc1
Ali Saidi [Wed, 28 Jul 2004 21:56:42 +0000 (17:56 -0400)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/tmp/m5
--HG--
extra : convert_revision :
11ce57baaa1ccdb159d83bdad527c92087aa0502
Ali Saidi [Wed, 28 Jul 2004 21:56:36 +0000 (17:56 -0400)]
updated readme to reflect linux/scons changes
Put correct date in copyright headers based on bk changesets
LICENSE:
Updated copyright on license file
README:
Updaded readme to reflect shift to scons and linux support
cpu/trace/reader/ibm_reader.cc:
cpu/trace/reader/ibm_reader.hh:
cpu/trace/reader/itx_reader.cc:
cpu/trace/reader/itx_reader.hh:
cpu/trace/reader/m5_reader.cc:
cpu/trace/reader/m5_reader.hh:
cpu/trace/reader/mem_trace_reader.cc:
cpu/trace/reader/mem_trace_reader.hh:
cpu/trace/trace_cpu.cc:
cpu/trace/trace_cpu.hh:
updated copyright (only changeset in 2004)
kern/kernel_stats.cc:
kern/kernel_stats.hh:
updated copyright
--HG--
extra : convert_revision :
726aed4b38ff4d230c63a570df83c63075b3c76f
Nathan Binkert [Tue, 27 Jul 2004 03:10:20 +0000 (23:10 -0400)]
style
--HG--
extra : convert_revision :
7489726b6c7bd11af603a448e4ff56c1e46139fe
Nathan Binkert [Mon, 26 Jul 2004 17:03:27 +0000 (13:03 -0400)]
Move the query function to the cc file and make trace stuff work
base/mysql.cc:
Move the query function to the cc file
make the trace stuff work
base/mysql.hh:
Move the query function to the cc file
--HG--
extra : convert_revision :
c47cb12afa47d3fe4a7a031b3563601adab62913
Nathan Binkert [Fri, 23 Jul 2004 20:30:35 +0000 (16:30 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/current
--HG--
extra : convert_revision :
375f5dc9556fa12bd67915b8c348f35f49ca5049
Nathan Binkert [Fri, 23 Jul 2004 19:52:28 +0000 (15:52 -0400)]
add a trace mechanism to trace sql stuff
base/mysql.hh:
Trace sql queries
base/traceflags.py:
Add a trace flag to trace sql queries
--HG--
extra : convert_revision :
dc25abb474db7334529b791a7aa90f8178ea59ea
Nathan Binkert [Fri, 23 Jul 2004 16:44:55 +0000 (12:44 -0400)]
use the linux 2.6 kernel
Make it so the two system config can have one system with
a cache hier and the other without
--HG--
extra : convert_revision :
32403821cb889d00283ae0982e3fbe21a93acce4
Nathan Binkert [Fri, 23 Jul 2004 16:19:27 +0000 (12:19 -0400)]
When a packet has finished transmitting, kick the state
machine too. The fifo may have been full and we want
to get another packet into it if we can.
--HG--
extra : convert_revision :
8f57294bd18f5eccb900118f2de83a4ccfd20dbb
Nathan Binkert [Fri, 23 Jul 2004 15:54:54 +0000 (11:54 -0400)]
formatting
--HG--
extra : convert_revision :
a1577ca129ff98ab83bb46714331831c15156adc
Nathan Binkert [Fri, 23 Jul 2004 04:24:24 +0000 (00:24 -0400)]
sim ticks should be the number of elapsed ticks, not curTick
--HG--
extra : convert_revision :
709753255e3e0425940b49e5df0271105935f3d4
Nathan Binkert [Fri, 23 Jul 2004 04:15:52 +0000 (00:15 -0400)]
a little bit more info when dumping the event queue.
add a function that can be called from the debugger to dump
the event queue
--HG--
extra : convert_revision :
2a8bb9b948abf611e8dc8cefe208a33b7a3c2c90
Nathan Binkert [Fri, 23 Jul 2004 04:14:26 +0000 (00:14 -0400)]
If we're doing mysql, we're doing binning
--HG--
extra : convert_revision :
a5a15136d991b41263d6e5aa2f79deefc85a99a9
Nathan Binkert [Fri, 23 Jul 2004 04:05:29 +0000 (00:05 -0400)]
notify the transmitter when the packet has finished transmitting.
--HG--
extra : convert_revision :
66f6f80945c1f621cdc3e743f601d2a73361bacd
Nathan Binkert [Fri, 23 Jul 2004 03:59:12 +0000 (23:59 -0400)]
Stats database fixes to avoid naming conflicts in the database
and to do proper dumping of non-binned stats.
base/stats/mysql.cc:
have configure return whether or not the stat is a printable
stat. This avoids naming problems in the database.
don't store non printable stats.
dump non-binned stats into the special bin 0
base/stats/mysql.hh:
have configure return whether or not the stat is a printable
stat. This avoids naming problems in the database.
--HG--
extra : convert_revision :
e33b115d605226a838eee2e6489e03b8d77ffc02
Nathan Binkert [Fri, 23 Jul 2004 03:54:24 +0000 (23:54 -0400)]
Add support to store less than the full packet in an etherdump
and actually default to only storing a max of 96 bytes per
packet since that should be plenty to fit all of the headers in.
--HG--
extra : convert_revision :
0c4a6571d80536477ed166e695d957e39da0334e
Nathan Binkert [Fri, 23 Jul 2004 01:31:35 +0000 (21:31 -0400)]
more initial checking of stats
base/statistics.cc:
add more checking to the stats stuff to make sure that
things are set up correctly
base/stats/statdb.cc:
Check that bins are only registered once.
--HG--
extra : convert_revision :
b0eafe4f584a8587dc3bf48812c632531ca28cb6
Ali Saidi [Wed, 21 Jul 2004 22:48:13 +0000 (18:48 -0400)]
one more fix to the ini files
--HG--
extra : convert_revision :
1261cb1dd78c3a7e4ec1c99de4b6136819375016
Ali Saidi [Wed, 21 Jul 2004 20:26:51 +0000 (16:26 -0400)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/tmp/m5
--HG--
extra : convert_revision :
8444a4f15530bef95350e124f9b840c74e236f7d
Ali Saidi [Wed, 21 Jul 2004 20:26:43 +0000 (16:26 -0400)]
updated config files to fix what was broken in paper rush
--HG--
extra : convert_revision :
3128d0edd9367cff6a24cd923068535b59de25fd
Nathan Binkert [Wed, 21 Jul 2004 19:44:57 +0000 (15:44 -0400)]
Wrap tracing stuff in #if TRACING_ON to avoid compile error
in m5.fast
--HG--
extra : convert_revision :
329d810bfe282e88133ca35da62ee6dcc73a38f5
Steve Reinhardt [Mon, 19 Jul 2004 06:03:17 +0000 (23:03 -0700)]
Add python-file-to-c-string utility for compiling python into the simulator
(for later piping to a forked interpreter, unless we go crazy and embed it).
--HG--
extra : convert_revision :
70860b12780830a16c48aedd495fd79730dfce4c
Lisa Hsu [Sun, 18 Jul 2004 04:03:07 +0000 (00:03 -0400)]
add some new stats and make one more change to the way the split lifo works.
--HG--
extra : convert_revision :
f9154409014cb9edba6c33be1e1063f13c593ea3
Lisa Hsu [Sat, 17 Jul 2004 03:29:33 +0000 (23:29 -0400)]
split_lifo.cc:
oops, also need to move a newly replaced blk to tail, if not there already.
--HG--
extra : convert_revision :
6e118cd135987c401f3663575d08f33c2c0c4ceb
Lisa Hsu [Sat, 17 Jul 2004 01:04:25 +0000 (21:04 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/linux-clean
--HG--
extra : convert_revision :
6bdf1a161163ca1cec55b2a608b0e31eac8ef6b3
Lisa Hsu [Sat, 17 Jul 2004 01:01:49 +0000 (21:01 -0400)]
split_lifo.cc:
clear the isUsed flag for a block when it is replace in the 2Q scheme
--HG--
extra : convert_revision :
3284fe5ba4eb29dbd472237c09f95a8c92b2da5a
Nathan Binkert [Thu, 15 Jul 2004 03:02:11 +0000 (23:02 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
87387b4f896ed945196b2090484c932c8b7e5abc
Nathan Binkert [Thu, 15 Jul 2004 03:01:54 +0000 (23:01 -0400)]
Add a clock multiplier for simple CPU so that it is possible
to do multiple instructions per cycle.
--HG--
extra : convert_revision :
5588ae38071f170792aad93899fef6842b7d818d
Erik Hallnor [Thu, 15 Jul 2004 01:34:51 +0000 (21:34 -0400)]
Fix serialization when a tx interrupt isn't scheduled
dev/uart.cc:
Fix serialization when a tx interrupt isn't scheduled.
--HG--
extra : convert_revision :
3029e284cbba417e3f453d83fdf2ef307d684916
Steve Reinhardt [Wed, 14 Jul 2004 19:48:19 +0000 (15:48 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
c79927401293a4496223cf190b9fc6cab6ea12de
Steve Reinhardt [Wed, 14 Jul 2004 19:48:11 +0000 (15:48 -0400)]
SConscript:
Make decoder.cc/hh depend on isa_parser.py.
SConscript:
Make decoder.cc/hh depend on isa_parser.py.
--HG--
extra : convert_revision :
ff575d7f819da951423b36275e960fed652f9b2b
Nathan Binkert [Wed, 14 Jul 2004 13:44:31 +0000 (09:44 -0400)]
adjust latencies so that they more closely match numbers seen
in the real world.
re-work kernel ini files for more flexibility
--HG--
extra : convert_revision :
075c31c9daf251117cde7ef659e37e32d5e4b0c8
Nathan Binkert [Wed, 14 Jul 2004 13:06:56 +0000 (09:06 -0400)]
fix paths for changes in disk image layout
--HG--
extra : convert_revision :
506ff845efc8d786639c29931eb4abd3a5860fcf
Nathan Binkert [Wed, 14 Jul 2004 13:02:15 +0000 (09:02 -0400)]
Fix infinite loop in ns_gige stat machine
argh!
dev/ns_gige.cc:
Exit the state machine so that we don't come right back where
we started and enter an infinite loop.
--HG--
extra : convert_revision :
a5f2b5b5a692de6c80e4b02d7f9bc5d27fe17252
Lisa Hsu [Tue, 13 Jul 2004 15:05:43 +0000 (11:05 -0400)]
remove a panic in split.cc:regernateBlkAddr that shouldnt' be there.
--HG--
extra : convert_revision :
59029318d714cd93e998e45429cf96694020cc3c
Nathan Binkert [Tue, 13 Jul 2004 03:01:53 +0000 (23:01 -0400)]
put the formatting fixes back into devtime
util/ccdrv/devtime.c:
put the formatting fixes back. no tabs.
--HG--
extra : convert_revision :
541e91294ee5383f3b321dd084876ae7c353cce9
Nathan Binkert [Tue, 13 Jul 2004 02:58:22 +0000 (22:58 -0400)]
make the cache access latency a parameter that is based on bus
ticks for the most commonly accessed devices.
dev/baddev.cc:
Get rid of the constant cache access latency.
For unimportant devices, don't add any latency.
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/tsunami_cchip.cc:
dev/tsunami_cchip.hh:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/tsunami_pchip.cc:
dev/tsunami_pchip.hh:
dev/uart.cc:
dev/uart.hh:
make the cache access latency a parameter that is based on bus
ticks.
dev/io_device.cc:
dev/io_device.hh:
add an io latency variable
dev/ns_gige.hh:
this moved to io_device.hh
--HG--
extra : convert_revision :
4883130feeaef48abee492eddf0b8eb40eb94789
Ali Saidi [Tue, 13 Jul 2004 02:51:20 +0000 (22:51 -0400)]
modified devtime to print out raw data
--HG--
extra : convert_revision :
5ad673d6f684acaffeb61db794f7e2ac099ba99d
Nathan Binkert [Tue, 13 Jul 2004 02:33:27 +0000 (22:33 -0400)]
formatting
--HG--
extra : convert_revision :
cbd0c148a50643191372fdba2f771d7e145f1bff
Lisa Hsu [Mon, 12 Jul 2004 20:09:52 +0000 (16:09 -0400)]
make tx/rx fifo size a param, also fix the empty dma problem by adjusting the state machine.
dev/ns_gige.cc:
make tx/rx fifo sizes a param. the default is 128K for each. also, make the state machine not move onto txFragRead if there is no room in the txfifo for data.
dev/ns_gige.hh:
make tx/rx fifo size a param
--HG--
extra : convert_revision :
ed91eb31c2b21d4cdc6de87d8641df6197be5209
Nathan Binkert [Sun, 11 Jul 2004 19:35:11 +0000 (15:35 -0400)]
Fix a couple of bugs in lisa's cache partitioning code.
--HG--
extra : convert_revision :
d3b6920609a59a33ac19bb1b395f5ae9694c2b53
Lisa Hsu [Sun, 11 Jul 2004 01:57:59 +0000 (21:57 -0400)]
the changeset of partitioned caches. this changeset creates Split tagstore class that makes either an LRU/LRU cache or a LRU/LIFO cache, it is also able to make just a LIFO cache.
SConscript:
add these files for partitioned caches
base/traceflags.py:
add Split as a traceflag
--HG--
extra : convert_revision :
6aa8f7c389ee1145b33be006c820236f11f5397c
Andrew Schultz [Sat, 10 Jul 2004 02:32:27 +0000 (22:32 -0400)]
Remove second pciToDma translation on current PRD address pointer b/c
second translation (which is superfluous) doesn't work properly when
system memory is higher than 128MB
--HG--
extra : convert_revision :
9cdf6925689d376953b1aa071bcd1e2f06419202
Nathan Binkert [Fri, 9 Jul 2004 19:08:42 +0000 (15:08 -0400)]
Defer registration only if we're sampling
--HG--
extra : convert_revision :
1bae80c02b39f91bb7867dad37cf170fd63ae838
Lisa Hsu [Fri, 9 Jul 2004 15:50:40 +0000 (11:50 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/m5clean
--HG--
extra : convert_revision :
78beb2735c6536ce3e639d59c99e755e9139f4f1
Lisa Hsu [Fri, 9 Jul 2004 15:50:27 +0000 (11:50 -0400)]
when you add caches, dma commands within the state machine are delayed and cause the state machine to exit until the dma comes back. thus, all relevant code must be executed BEFORE going to do the dma code.
dev/ns_gige.cc:
rearrange code so nothing gets skipped when "doing dma."
--HG--
extra : convert_revision :
cca66885f45e7df1831e2d8ccaddf5ece7600b13
Nathan Binkert [Fri, 9 Jul 2004 03:36:09 +0000 (23:36 -0400)]
fix compile problem in floss_reasons.cc
--HG--
extra : convert_revision :
86252dca4cd0bd6c1bcfc5bc14aaa3b941c3a8f8
Nathan Binkert [Thu, 8 Jul 2004 22:16:30 +0000 (18:16 -0400)]
- fix bad merge
- pass in sample name to mysql
--HG--
extra : convert_revision :
5a31085931037637d05d6acdf601dee582a46710
Nathan Binkert [Thu, 8 Jul 2004 21:48:13 +0000 (17:48 -0400)]
Clean up some mysql stuff to make things work again and
hopefully improve performance a tad.
base/stats/mysql.cc:
- it's not called sample anymore, it's called tick
- don't bother to cleanup deleted runs. Doing this for each run
is not necessary, it can be done all at once
- don't query for a bin id every time, just do it once.
- use locking in a few places to prevent two processes from
stepping on eachother.
- don't duplicate subdata ids. use -1,y and x,-1
base/stats/mysql.hh:
It's not called sample anymore, it's called tick
--HG--
extra : convert_revision :
95de8498b627c9175da28a66604ec7c719f7804c
Nathan Binkert [Thu, 8 Jul 2004 21:44:08 +0000 (17:44 -0400)]
Clean up floss statistics names to avoid duplicate names
--HG--
extra : convert_revision :
57f34deaad00cc368e282a9f55ea8525b7c84563
Nathan Binkert [Thu, 8 Jul 2004 21:37:22 +0000 (17:37 -0400)]
unify all system boot ini files into a single one. To run
different experiments, use --<foo>.system:readfile=<script>
to change the experiment
--HG--
extra : convert_revision :
ff622a567bb10a14c5dd427a54814677cb205d7c
Nathan Binkert [Thu, 8 Jul 2004 20:08:47 +0000 (16:08 -0400)]
FullCPU needs its registration deferred
--HG--
extra : convert_revision :
1bb84b34333540456c2735e11a8927262b4db4c8
Nathan Binkert [Thu, 8 Jul 2004 20:02:37 +0000 (16:02 -0400)]
Tick is signed, so make Event start be large and positive,
not negative
--HG--
extra : convert_revision :
96be42a30fc0bd59eaff1d19161d881cab3895ae
Nathan Binkert [Thu, 8 Jul 2004 20:01:13 +0000 (16:01 -0400)]
Scripts that can be used with server.readfile and client.readfile
to run the netperf benchmark
--HG--
extra : convert_revision :
a2ce490e0c44996d0876a6839ad333643ec252c8
Nathan Binkert [Thu, 8 Jul 2004 19:59:46 +0000 (15:59 -0400)]
store the checkpoint to the proper directory
dev/disk_image.cc:
store the disk checkpoint to the proper directory
--HG--
extra : convert_revision :
f76347576691560f00c60b86ac2044960d5a193c
Andrew Schultz [Thu, 8 Jul 2004 19:22:41 +0000 (15:22 -0400)]
Change mount command for mounting disk images
--HG--
extra : convert_revision :
450e8c7332c1e3162cdbef4177b7f54b47b1648a
Nathan Binkert [Thu, 8 Jul 2004 18:23:49 +0000 (14:23 -0400)]
Fix the cache's address range.
**warning** this is still a hack. The caches need to figure this
out on their own!
--HG--
extra : convert_revision :
4fbebf302bfbeaa35e5aad276934d8d1ce5c6baf
Lisa Hsu [Thu, 8 Jul 2004 13:05:26 +0000 (09:05 -0400)]
fix the failing regression. the sconscript ("makefile") was missing the etherbus.cc src file.
SConscript:
THIS is why the regression keeps failing. it's missing the the etherbus file in the sconscript.
--HG--
extra : convert_revision :
adbcfb6036d8e8ecb51c4f484d0030059542684b
Ali Saidi [Thu, 8 Jul 2004 04:28:02 +0000 (00:28 -0400)]
fixed a bad merge from linux<->tru64
--HG--
extra : convert_revision :
d7a5acd89a2bdc013c8a2bd022cc7048a3920f01
Lisa Hsu [Wed, 7 Jul 2004 00:04:17 +0000 (20:04 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/linux-clean
--HG--
extra : convert_revision :
e0192f56c189e595daf3c020a56e1c02010aefbc
Nathan Binkert [Tue, 6 Jul 2004 23:27:33 +0000 (19:27 -0400)]
disable the binned_fn stuff
cpu0 -> cpu since we're not all set up for MP in the
ini files just yet.
--HG--
extra : convert_revision :
69a5af791ea89fec7e647d55644cc4eeaf924651
Nathan Binkert [Tue, 6 Jul 2004 23:22:39 +0000 (19:22 -0400)]
Make binning work with stuff other than FS_MEASURE
--HG--
extra : convert_revision :
e3fa3cfbdf2f13dd3a8d2266dd64c2c335f998d6
Nathan Binkert [Tue, 6 Jul 2004 23:21:47 +0000 (19:21 -0400)]
Fix some ini stuff.
--HG--
extra : convert_revision :
b870550f52901fe723eeab24a14ac4c1222ee1bd
Lisa Hsu [Tue, 6 Jul 2004 21:55:16 +0000 (17:55 -0400)]
tag each mem_req as coming from the nic if it is DMA'd from the NIC. the NIC tells the DMA interface, which in turn sets a new nic_req flag in the MemReq it makes.
dev/ns_gige.cc:
tell all outgoing dma events that this request is from the NIC
--HG--
extra : convert_revision :
62af17a2728a0ff729e7723dc29bd0d130ca5fe3
Lisa Hsu [Tue, 6 Jul 2004 21:42:58 +0000 (17:42 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/linux-clean
--HG--
extra : convert_revision :
cd46aa31dab82e43c3c4f8bb6f0fe2e018acfd12
Erik Hallnor [Tue, 6 Jul 2004 15:29:23 +0000 (11:29 -0400)]
Remove duplicate stat
cpu/trace/reader/m5_reader.cc:
Wrap assert variable in NDEBUG
--HG--
extra : convert_revision :
8c79dc30eff2f2fa0110a04c30df17ec4417c28c
Ali Saidi [Mon, 5 Jul 2004 20:49:56 +0000 (16:49 -0400)]
updated to work on all platforms (actually map sure that the physical
address we are trying to access is mapped before accessing it.)
--HG--
extra : convert_revision :
104341334a3d2bb812a6b0b6277ab353f8f9b39e
Ali Saidi [Mon, 5 Jul 2004 19:49:42 +0000 (15:49 -0400)]
Added code to read any location in memory a repetative number of and
average the results.
It works on alpha but I haven't got it working on x86 I think for
lack of knowing a good address to read.
--HG--
extra : convert_revision :
e2442de641741674d692245712aa92e258cf6d48
Lisa Hsu [Mon, 5 Jul 2004 15:20:53 +0000 (11:20 -0400)]
these changes are an undo from my last changeset. these are meant for later.
--HG--
extra : convert_revision :
0126918ef293cba02aaaa61dff3c471eb4743116
Lisa Hsu [Sun, 4 Jul 2004 20:47:07 +0000 (16:47 -0400)]
almost forgot to do this - hope it doesn't mess up schedule.
dev/ns_gige.cc:
dev/ns_gige.hh:
add the stats nate wanted
--HG--
extra : convert_revision :
b59d586def7df31741b53cdb59cf3b19253caf26
Lisa Hsu [Sun, 4 Jul 2004 16:08:54 +0000 (12:08 -0400)]
fix some broken .ini's
--HG--
extra : convert_revision :
c91b44b61919a10d3323601834d2959445308d0a
Nathan Binkert [Sat, 3 Jul 2004 14:10:43 +0000 (10:10 -0400)]
fix makefile to work with traceflags.py change
--HG--
extra : convert_revision :
4aef47dc721684a786034aa85aea0c81822ec2eb
Steve Reinhardt [Sat, 3 Jul 2004 04:17:51 +0000 (21:17 -0700)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
64c0ab7d2095ea8327bfc95fdf2151cf3ee5fd16
Steve Reinhardt [Sat, 3 Jul 2004 04:16:38 +0000 (21:16 -0700)]
Initial SCons-based build system. See scons.org.
'cd build; scons' will build ALPHA/m5.debug.
Use e.g. 'scons KERNEL/m5.opt' to build other binaries.
Read the comments in build/SConstruct for more details.
base/traceflags.py:
Take basename of generated cc/hh files from command line instead
of hardwiring them. Lets us call the script from a different
directory and still have the files end up in the right place
(e.g. "base/traceflags.py base/traceflags").
--HG--
extra : convert_revision :
ee4dbb59040cf07590929275f6c1c01e8d4e00b4
Nathan Binkert [Fri, 2 Jul 2004 20:40:23 +0000 (16:40 -0400)]
Fix byteswap on LP64 (amd64)
kern/linux/linux_system.cc:
Formatting
sim/host.hh:
When we say ULL and UL we really just want a 64-bit value, not
necessarily a long long, so cast the integer to (u)int64_t
this fixes a problem with byte swapping.
--HG--
extra : convert_revision :
ad25ace5a7b92a7c928f2d52e531193c91f3f8c8
Nathan Binkert [Fri, 2 Jul 2004 16:30:06 +0000 (12:30 -0400)]
Need to #include <unistd.h> to build with pread
--HG--
extra : convert_revision :
1e5b3e5f1eaba3853d7d3da5546387c16932ab6a
Nathan Binkert [Thu, 1 Jul 2004 22:03:05 +0000 (18:03 -0400)]
implement the readfile pseudo instruction that will read
a realworld file.
arch/alpha/isa_desc:
arch/alpha/pseudo_inst.hh:
implement the readfile pseudo instruction that will read a
chunk of a realworld file.
arch/alpha/pseudo_inst.cc:
implement the readfile pseudo instruction that will read a
chunk of a realworld file. The filename is a per system
parameter and comes from the system itself.
kern/linux/linux_system.cc:
sim/system.hh:
Create a per-system readfile parameter for use by the readfile
pseudo instruction. That way each system can get its own file.
--HG--
extra : convert_revision :
941b3a3e20702a6252b219ca66a6d90da2944c50
Nathan Binkert [Thu, 1 Jul 2004 22:00:18 +0000 (18:00 -0400)]
rename CopyData to CopyOut and implement CopyIn to copy data
from the simulator into the simulatee
kern/tru64/dump_mbuf.cc:
rename CopyData -> CopyOut
--HG--
extra : convert_revision :
e3ef27a5762dfc495dcb84a372470464c27557d2
Nathan Binkert [Thu, 1 Jul 2004 18:02:23 +0000 (14:02 -0400)]
sort out common files into configs/kernel
fix up includes get stuff from the proper directories
--HG--
extra : convert_revision :
7226e211a5db0d11880684150670d1cd5bc998ab
Andrew Schultz [Thu, 1 Jul 2004 16:08:52 +0000 (12:08 -0400)]
Add documentation for linux-dist system and make some small formatting
changes
--HG--
extra : convert_revision :
5371561a10156cdb8dd7c2b5688d07e45510bf76
Ali Saidi [Wed, 30 Jun 2004 20:06:50 +0000 (16:06 -0400)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
eec2cf5ef2f8452bca955fd8aecb062d07502b0b
Ali Saidi [Wed, 30 Jun 2004 20:06:47 +0000 (16:06 -0400)]
Update MAX ASN in kernel to 127 since that's what the ev5 supports
--HG--
extra : convert_revision :
e1feca854301682a7ce58e8f4ff149b10d2beb4b
Nathan Binkert [Wed, 30 Jun 2004 18:53:26 +0000 (14:53 -0400)]
fix the -I flag stuff for CPP so it actually works right.
What was I smoking?
--HG--
extra : convert_revision :
24488707a35febe006ec50a1fa7c9fad4842eadc
Nathan Binkert [Wed, 30 Jun 2004 18:51:40 +0000 (14:51 -0400)]
add asn when tracing tlb stuff
--HG--
extra : convert_revision :
abc774179b3d4c979efd98e32d1d071b142e7b48
Andrew Schultz [Wed, 30 Jun 2004 13:47:32 +0000 (09:47 -0400)]
Merge zizzer:/bk/m5 into zizzer.eecs.umich.edu:/z/alschult/m5
--HG--
extra : convert_revision :
0bd6506e79600775dd0f72996120321f249b3411
Andrew Schultz [Wed, 30 Jun 2004 13:47:23 +0000 (09:47 -0400)]
Change assert to check on virtual addresses because the physical
address can be zero for a copy
--HG--
extra : convert_revision :
c6089969396aee2d67fa695a31cb7c5aea794338
Lisa Hsu [Wed, 30 Jun 2004 04:51:11 +0000 (00:51 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/linux-clean
--HG--
extra : convert_revision :
a072c1560e1f8b5cac378ed5f047a8a9c86b97b9
Lisa Hsu [Wed, 30 Jun 2004 04:50:56 +0000 (00:50 -0400)]
fix transmit side checksum offloading to not generate a pseudo header.
dev/ns_gige.cc:
transmit side checksum offloading doesn't need pseudo header generation, it just takes the pseudo header checksum and uses it.
--HG--
extra : convert_revision :
9741bd650415c18ed37b06a453b23610d028135b
Ali Saidi [Tue, 29 Jun 2004 20:08:33 +0000 (16:08 -0400)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
7e1d8e3723f47338f0b24071ee95c66a9561dd2f
Ali Saidi [Tue, 29 Jun 2004 20:08:26 +0000 (16:08 -0400)]
Another fix for the too much work problem in 2.6. This should do it.
Both rx/tx interrupts are now scheduled for the future to give the
linux kernel time to get out of its loop.
--HG--
extra : convert_revision :
8fee0a25fde0ce0545c924f8547bed460602e006
Nathan Binkert [Tue, 29 Jun 2004 17:03:20 +0000 (13:03 -0400)]
Get rid of old ini files that haven't been used in a long time.
--HG--
extra : convert_revision :
43c21727952d46363a46ef3d8fe89546576edc08
Ali Saidi [Tue, 29 Jun 2004 01:23:10 +0000 (21:23 -0400)]
With the new uart code 300 cycles isn't quite enough, 350 seems to
work. When everything gets changed to seconds this should be updated.
--HG--
extra : convert_revision :
9f1064ff6fec5deceb591904f4571c9129ecc998
Nathan Binkert [Mon, 28 Jun 2004 20:49:35 +0000 (16:49 -0400)]
fix up the recordEvent stuff to support ignoring events
arch/alpha/ev5.cc:
cpu/simple_cpu/simple_cpu.cc:
update for new event interface
base/stats/events.cc:
implement the ignore event function which matches sim objects from which
to ignore events.
Make insert event like insert data and make it able to insert many
events in a single transaction with the database.
base/stats/events.hh:
Make it possible to ignore events
sim/sim_object.cc:
make recordEvent a member function of SimObject to implement
the ignore function easily
sim/sim_object.hh:
implement the ignore event stuff in the sim object. This is a
bit of a hack, but an easy place to put it.
--HG--
extra : convert_revision :
ba3f25a14ad03662c53fb35514860d69be8cd4f0
Nathan Binkert [Mon, 28 Jun 2004 19:54:05 +0000 (15:54 -0400)]
Don't serialize the absolute path so we can move checkpoints around.
sim/serialize.cc:
sim/serialize.hh:
export the checkpoint directory
--HG--
extra : convert_revision :
ba5b796fd930ab0487a502beefcf76bd6bb7c366
Nathan Binkert [Mon, 28 Jun 2004 19:53:06 +0000 (15:53 -0400)]
add support to add a string to indicate a particular sample of a run
name to make statistical sampling easier.
--HG--
extra : convert_revision :
b24db4ef747b8ef00a0131db237e97de60c27dc3
Steve Reinhardt [Sun, 27 Jun 2004 22:17:16 +0000 (15:17 -0700)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
ad13cd0c7d700ec75ed98f517cbde3147e698940
Ali Saidi [Sun, 27 Jun 2004 18:33:55 +0000 (14:33 -0400)]
allow the use of old console code and update elf_object not to rely on EM_ALPHA value.
base/loader/elf_object.cc:
EM_ALPHA value isn't official, so perhaps we shouldn't use it
dev/alpha_console.cc:
dev/alpha_console.hh:
this change allows the use of old console code
--HG--
extra : convert_revision :
cfacd64ae7fd2595158ca1a83ebcdb66ee7e119b
Ali Saidi [Sun, 27 Jun 2004 01:43:17 +0000 (21:43 -0400)]
removed LINUX system dir, all we really need is one that both tru64 and linux can share
--HG--
extra : convert_revision :
7417031db632255749d2a8201d761a001fb7de2e
Ali Saidi [Sun, 27 Jun 2004 01:26:28 +0000 (21:26 -0400)]
rewrote uart and renamed console.cc to simconsole to reduce confusion
base/traceflags.py:
removed TsunamiUart/TlaserUart and added a plain Uart
dev/alpha_console.cc:
updated for new simconsole
dev/platform.hh:
added a uart member to platform
dev/simconsole.cc:
dev/simconsole.hh:
removed lots of legacy code, it should all be ours now.
converted tabs to 8 spaces
added our copyright
dev/tsunami.cc:
uses simconsole.hh rather than console.hh
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
never needed console.hh
dev/tsunami_io.hh:
this does need eventq.hh and it just happend to be working whenn console.hh was
included everywhere
dev/tsunamireg.h:
added a couple more 8250/16550 uart defines
dev/uart.cc:
new uart code, rewritten to support both tlaser and tsunami (both a 8250 and 8530
uart).
dev/uart.hh:
updated for new uart, legacy code removed
--HG--
rename : dev/console.cc => dev/simconsole.cc
rename : dev/console.hh => dev/simconsole.hh
rename : dev/tsunami_uart.cc => dev/uart.cc
rename : dev/tsunami_uart.hh => dev/uart.hh
extra : convert_revision :
e663352d49d4c2d3c95643030cf73c0e85ba2f08