Ron Dreslinski [Tue, 2 Mar 2004 02:26:21 +0000 (21:26 -0500)]
Auto merged
--HG--
extra : convert_revision :
607177f165a6057de8befd554d31478bbda55239
Ron Dreslinski [Tue, 2 Mar 2004 02:17:28 +0000 (21:17 -0500)]
Add support for two buses to the DMA, allows header splitting
The two busses are labeled header/payload. The header_size
designates the number of cache blocks to send on the header bus.
--HG--
extra : convert_revision :
930411052d2183311f9be7a10087c77552a35b37
Nathan Binkert [Mon, 1 Mar 2004 21:22:51 +0000 (16:22 -0500)]
Initial cut at adding support to make the state machine
take time
--HG--
extra : convert_revision :
f30ab2f00dd6f00ad8020912e709d057a2875526
Nathan Binkert [Mon, 1 Mar 2004 21:22:09 +0000 (16:22 -0500)]
Use #define CPU_10GHZ and CPU_4GHZ. This should get fixed when
we switch over to making ticks represent time directly.
--HG--
extra : convert_revision :
29e76e909a184e1ba005a98dd80ca5da1d345f3e
Nathan Binkert [Mon, 1 Mar 2004 21:19:12 +0000 (16:19 -0500)]
Support several memory configurations for hooking up devices
to memory in different configurations
--HG--
extra : convert_revision :
9e31c2fa96eeb42160cc0b892e10e6db58fe786b
Nathan Binkert [Mon, 1 Mar 2004 21:18:02 +0000 (16:18 -0500)]
add support for averaging
--HG--
extra : convert_revision :
f0b5f622f96795a5d2160eeb2b52ecfd83170b67
Nathan Binkert [Mon, 1 Mar 2004 21:17:18 +0000 (16:17 -0500)]
Only need an execution context if we're doing data
--HG--
extra : convert_revision :
389a02fbf2f266e0c5e8ae07fd28138f7ebfc80c
Erik Hallnor [Mon, 1 Mar 2004 04:13:27 +0000 (23:13 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
a9b6e6592e9c0f7e5cba45e148005647ea3539c4
Erik Hallnor [Mon, 1 Mar 2004 04:13:04 +0000 (23:13 -0500)]
Fix an assert, only need the ExecContext if we are doing data,
--HG--
extra : convert_revision :
07f674613cb39ffe77dd66c2c9a77ed73b9d75b6
Nathan Binkert [Mon, 1 Mar 2004 03:56:59 +0000 (22:56 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
ba093baca9abfe311621e9589fcec0a892e9f9d1
Nathan Binkert [Mon, 1 Mar 2004 03:56:42 +0000 (22:56 -0500)]
Fix the swichover code. It's only for FULL_SYSTEM
cpu/base_cpu.cc:
#ifdef FULL_SYSTEM
--HG--
extra : convert_revision :
427ee93d545596da00d6c4688a7e32d584054948
Erik Hallnor [Mon, 1 Mar 2004 03:41:11 +0000 (22:41 -0500)]
Remove copys from isa_desc, and implement a store and forward bus bridge
arch/alpha/isa_desc:
Just to make sure, remove the new copy instructions until everything works.
--HG--
extra : convert_revision :
cdd3d4c8fa415175aaee04f4a99340dcf82dbc3a
Nathan Binkert [Mon, 1 Mar 2004 02:35:12 +0000 (21:35 -0500)]
unused function name
--HG--
extra : convert_revision :
ef2994f2d18a36580994b4fa7005e6dceb072b31
Nathan Binkert [Mon, 1 Mar 2004 02:34:25 +0000 (21:34 -0500)]
make it so that we can prevent descriptor DMAs or
data DMAs from touching the memory system. They can
still have a latency though if configured.
--HG--
extra : convert_revision :
d372205643bd46f7fb7d50a20569ac74ae37ce38
Nathan Binkert [Mon, 1 Mar 2004 01:38:25 +0000 (20:38 -0500)]
mark the request satisfied since well, it is.
--HG--
extra : convert_revision :
667c477b0b5ca45d63eaecabcf5119701584599f
Nathan Binkert [Mon, 1 Mar 2004 01:35:55 +0000 (20:35 -0500)]
Avoid more bogus addresses
--HG--
extra : convert_revision :
25bc2adb78e2f96fb28b352a73401c3fa52eab03
Nathan Binkert [Mon, 1 Mar 2004 01:32:30 +0000 (20:32 -0500)]
fix switchover WRT interrupts
cpu/base_cpu.cc:
gah! copy the interrupt status on switchover
--HG--
extra : convert_revision :
d3199a7409a494b7687354c43ffca697f37e8456
Nathan Binkert [Mon, 1 Mar 2004 01:25:52 +0000 (20:25 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
b3fd8bcfbaf1e9d09bac8c1403944df36dde671e
Nathan Binkert [Mon, 1 Mar 2004 01:22:32 +0000 (20:22 -0500)]
Initial cleanup pass of lisa's function call tracking
code.
base/statistics.hh:
We're getting rid of FS_MEASURE, but for now, we're going
to still use a compile time flag to turn on and off binning
of statistics. (The flag is STATS_BINNING)
cpu/exec_context.cc:
cpu/exec_context.hh:
kern/tru64/tru64_system.cc:
get rid of FS_MEASURE
cpu/simple_cpu/simple_cpu.cc:
yank the function call tracking code out of the cpu and move
it into the software context class itself.
kern/tru64/tru64_system.hh:
get rid of FS_MEASURE
move all of the tacking stuff to the same place.
sim/system.hh:
cleanup
--HG--
extra : convert_revision :
73d3843afe1b3ba0d5445421c39c1148d3f4e7c0
Nathan Binkert [Mon, 1 Mar 2004 00:31:58 +0000 (19:31 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
48e5262fc37a5774b10a83e4c36a89c0ef2c8f15
Nathan Binkert [Mon, 1 Mar 2004 00:29:30 +0000 (19:29 -0500)]
more debugging support
base/trace.cc:
code to set/clear/print trace flags from the debugger.
--HG--
extra : convert_revision :
f2a549e9af05c4a177186b9f1792a0493ce15c95
Nathan Binkert [Sun, 29 Feb 2004 23:49:44 +0000 (18:49 -0500)]
Make the progress event work even after restoring from a checkpoint
--HG--
extra : convert_revision :
80e31eb26250700ebe3ce5848e570068cc76ef47
Nathan Binkert [Sun, 29 Feb 2004 22:05:23 +0000 (17:05 -0500)]
Fix dumping to work on the opteron. struct timeval can
vary in size, so we're explicit about the fields.
--HG--
extra : convert_revision :
e5264849dafb878676b2bfd3a6e6f95f6f94ea48
Erik Hallnor [Sun, 29 Feb 2004 21:18:49 +0000 (16:18 -0500)]
Add support for multiple address ranges in memory interfaces.
dev/alpha_console.cc:
setAddrRange -> addAddrRange
--HG--
extra : convert_revision :
9dc853b80bea443b54a130ca4c110a68077cb336
Nathan Binkert [Sun, 29 Feb 2004 19:54:52 +0000 (14:54 -0500)]
fix rpcc
arch/alpha/ev5.cc:
actually implement the cycle count register
arch/alpha/isa_desc:
the rpcc instruction really just reads the cycle count
register
--HG--
extra : convert_revision :
a0edec85672377a62b90950efc17b62b375220b1
Steve Reinhardt [Sat, 28 Feb 2004 22:21:32 +0000 (17:21 -0500)]
Fix handling of rpcc in full-system mode.
arch/alpha/ev5.cc:
Handle writing IPR_CC and IPR_CC_CTL slightly more intelligently.
(Very slightly).
arch/alpha/isa_desc:
Upper half of rpcc result comes from value written
to IPR_CC, not actual cycle counter.
--HG--
extra : convert_revision :
7161989db8a3f040d0558e2e5a1a162ed1cb4125
Erik Hallnor [Fri, 27 Feb 2004 07:40:43 +0000 (02:40 -0500)]
Added copy instructions to the ISA. Well it didn't break anything yet...
arch/alpha/isa_desc:
Add copy_load and copy_store insts (ldf and stf respectively)
cpu/simple_cpu/simple_cpu.hh:
Add copy functions to SimpleCPU as well
--HG--
extra : convert_revision :
1fa041da582b418c47d4eefc22dabba978a50e2d
Erik Hallnor [Fri, 27 Feb 2004 05:45:21 +0000 (00:45 -0500)]
Initial copy support in the pipeline. Add copypal counting.
arch/alpha/osfpal.cc:
Add a string for copypal.
arch/alpha/osfpal.hh:
Add a code for copypal.
cpu/static_inst.hh:
Add an IsCopy flag.
--HG--
extra : convert_revision :
19e3d90368454806029ad492eace19cd0924fe9f
Nathan Binkert [Fri, 27 Feb 2004 01:40:00 +0000 (20:40 -0500)]
Erik Hallnor [Fri, 27 Feb 2004 01:36:29 +0000 (20:36 -0500)]
The DMAInterface was never updated to the new blocking model. Need to hold the request locally until it is retransmitted.
--HG--
extra : convert_revision :
cc89d6c4b7f21b7252c172c694633ce1daae30eb
Erik Hallnor [Thu, 26 Feb 2004 21:59:04 +0000 (16:59 -0500)]
Quick hack to allow rerequests for the future.
--HG--
extra : convert_revision :
4f1b080ae500dfd022c28e0cd7544c4fcfa5e330
Nathan Binkert [Thu, 26 Feb 2004 19:16:18 +0000 (14:16 -0500)]
stoopid
--HG--
extra : convert_revision :
ccd87a2de7f684bb3a4a448a307eb30afd363e12
Steve Reinhardt [Thu, 26 Feb 2004 15:08:45 +0000 (07:08 -0800)]
Merge.
--HG--
extra : convert_revision :
e83f6895bceb0ced656e90275ec1a93d0af5498d
Steve Reinhardt [Thu, 26 Feb 2004 15:05:36 +0000 (07:05 -0800)]
Make SW prefetch flag a parameter again, and add code to make
it actually do something on FullCPU. Still disabled, as it
causes detailed-boot to hang when you turn it on.
arch/alpha/isa_desc:
Add EAComp and MemAcc pseudo-instructions to prefetch StaticInst.
cpu/simple_cpu/simple_cpu.hh:
Changed prefetch() return type from Fault to void.
--HG--
extra : convert_revision :
c7cb42682bfea6af117c87d4dfdb06176b6fe6b7
Nathan Binkert [Thu, 26 Feb 2004 06:18:13 +0000 (01:18 -0500)]
Save the status of faulting write-hints so that they
won't accidentally be issued to the memory system.
--HG--
extra : convert_revision :
5696a09abcdee54c8bec72d9374f7944fb136740
Erik Hallnor [Thu, 26 Feb 2004 02:32:37 +0000 (21:32 -0500)]
Make this compile under non full system.
--HG--
extra : convert_revision :
6ae9b4af78cff3c8e5dc367fdbefad496a28857d
Lisa Hsu [Wed, 25 Feb 2004 23:25:20 +0000 (18:25 -0500)]
delay execContext registration from create() to init() callback in the sampling cpu also.
--HG--
extra : convert_revision :
d3947c55f95bb03e73a815188a517043f39925d4
Nathan Binkert [Wed, 25 Feb 2004 21:16:17 +0000 (16:16 -0500)]
prevent bogus addresses from being sent to the memory system
--HG--
extra : convert_revision :
4f08f8c7ab380436b2ad2c30ba53d9fe305e4496
Nathan Binkert [Wed, 25 Feb 2004 21:13:00 +0000 (16:13 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
2a258d16ba51ce34f5748825a94b456abfb577cc
Nathan Binkert [Wed, 25 Feb 2004 21:12:48 +0000 (16:12 -0500)]
Fix stats debugging and always compile it in for the
debug target
--HG--
extra : convert_revision :
aa16e6256a056e6df9affec6fd973e62e812e23c
Lisa Hsu [Tue, 24 Feb 2004 19:59:25 +0000 (14:59 -0500)]
add in an init() callback for CPU's so that no stats are accessed prior to the end of the build process. (Done by doing the registerExecContext() calling sequence in the init() process rather than the create() process).
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
same thing for simple cpu's.
--HG--
extra : convert_revision :
aac9f91742866fb26f8cace622f9b88454a69662
Steve Reinhardt [Mon, 23 Feb 2004 16:07:32 +0000 (08:07 -0800)]
Quote args properly in tracediff.
util/tracediff:
Quote simulator args so args with spaces get handled correctly.
--HG--
extra : convert_revision :
b48677bc712be17e6e50ca35680e757ba9364692
Nathan Binkert [Mon, 23 Feb 2004 07:49:09 +0000 (02:49 -0500)]
Only one request may be on the dma interface at a time,
so add some states to indicate that the dma read/write
hasn't issued yet, and add some support to reissue the
request when the interface becomes unblocked.
--HG--
extra : convert_revision :
448695a8eb2e9f98554769f3165df1f796adf44a
Nathan Binkert [Mon, 23 Feb 2004 07:46:47 +0000 (02:46 -0500)]
extend the hack by turning the address into a real
physical address
--HG--
extra : convert_revision :
9f752d5ab6def492056d4dfe0bda5eecb022ba80
Nathan Binkert [Mon, 23 Feb 2004 07:46:04 +0000 (02:46 -0500)]
Don't issue memory requests for bogus addresses
--HG--
extra : convert_revision :
786b7fa503436f9a269ebeaedf152c6364874ab5
Nathan Binkert [Mon, 23 Feb 2004 07:44:22 +0000 (02:44 -0500)]
Make this like PCI-X
--HG--
extra : convert_revision :
59eaf2c548a88df075b13e78aaa7a4377f20e6c8
Nathan Binkert [Sun, 22 Feb 2004 23:09:11 +0000 (18:09 -0500)]
configurable latency for programmed IO
fix serialization
dev/etherlink.cc:
fix serialization
--HG--
extra : convert_revision :
6739001f3f97b745d9874bb4c5729cc4909625c2
Nathan Binkert [Sat, 21 Feb 2004 15:46:31 +0000 (10:46 -0500)]
Change order of serialization
sim/sim_object.cc:
serialize objects in the reverse order of their creation.
This causes a SimObject that is dependent on another
to be serialized first. For example, the ethernet device
writes back some data to physical memory while serializing,
so this will cause the physical memory to be serialized
after that, preserving the data written back.
--HG--
extra : convert_revision :
f9a37b63ce777df1cfecefa80f94f8fc69e42448
Nathan Binkert [Sat, 21 Feb 2004 15:43:37 +0000 (10:43 -0500)]
New Ethernet device. Descriptors are now done via DMA instead
of faking it. Renamed stuff to follow our style. Lots of
general cleanup.
dev/etherpkt.hh:
fix up includes
--HG--
extra : convert_revision :
fb3a21466cdae00f8747d6e3027c9f2c63569c48
Nathan Binkert [Fri, 20 Feb 2004 20:24:21 +0000 (15:24 -0500)]
Add a simple event wrapper class that takes a class pointer
and member function and will schedule it for the future.
--HG--
extra : convert_revision :
f5c5a8df0839e1e10716850c2086862c4a5bc499
Nathan Binkert [Fri, 20 Feb 2004 20:23:27 +0000 (15:23 -0500)]
make the dma interface useable.
make it so that pio devices must respond with some delay.
dev/io_device.cc:
don't forget to include dma_interface.hh so we could use it.
dev/io_device.hh:
the generic BusInterface isn't enough for doing DMA
we need the actual DMAInterface
--HG--
extra : convert_revision :
70298d33c8520a3f4ad11aa600825a8cec7e44bf
Nathan Binkert [Fri, 20 Feb 2004 20:22:41 +0000 (15:22 -0500)]
make uncacheable stuff happen again
cpu/simple_cpu/simple_cpu.cc:
Allow requests to be uncacheable
--HG--
extra : convert_revision :
7ab1442f2eec3763d5bc6a6f37b11f663851b12c
Nathan Binkert [Fri, 20 Feb 2004 20:22:02 +0000 (15:22 -0500)]
make the devices default to being attached to the memory bus
but provide a #define that can be used to put them on
a separate IO bus
--HG--
extra : convert_revision :
75d48f312c503ad67d22319db691ef5a0de12996
Nathan Binkert [Fri, 20 Feb 2004 20:20:37 +0000 (15:20 -0500)]
Don't need to specify two etherdump devices
--HG--
extra : convert_revision :
62e8d6b218909c00a97d71e0d3b0f11816499fbf
Nathan Binkert [Fri, 20 Feb 2004 20:19:55 +0000 (15:19 -0500)]
Make it so dump takes a void *
base/trace.cc:
base/trace.hh:
take a void * for the raw data
--HG--
extra : convert_revision :
fc336dc82b4d533c3a0f319977074f26342445ea
Nathan Binkert [Fri, 20 Feb 2004 20:19:19 +0000 (15:19 -0500)]
make etherdump work again
dev/etherdump.cc:
now that init is automatically called by the framework, don't
init twice.
--HG--
extra : convert_revision :
16dcdef67aa193ed71ff546e7b255d60f39bf13d
Nathan Binkert [Fri, 20 Feb 2004 20:08:02 +0000 (15:08 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/memory
--HG--
extra : convert_revision :
691c89ebacb3c5a5eb67359ed102646b8547dd17
Ron Dreslinski [Fri, 20 Feb 2004 17:45:11 +0000 (12:45 -0500)]
Merge zizzer:/bk/m5 into zamp.eecs.umich.edu:/z/rdreslin/m5bk/clean
--HG--
extra : convert_revision :
b8e4d9c2901c4c784ecca351fd34a3f5a2845473
Ron Dreslinski [Fri, 20 Feb 2004 17:44:41 +0000 (12:44 -0500)]
Add serialization for packets on the ethernet link,
and for link events
--HG--
extra : convert_revision :
0054dbc4a42dd38ff8bbf64af303bc509dd5aa8a
Lisa Hsu [Fri, 20 Feb 2004 17:37:52 +0000 (12:37 -0500)]
put back $SETUPDIR = $ENV{PWD} for amd purposes.
--HG--
extra : convert_revision :
115a9ea8d08bf3e32ecb689962c8a12c9a7dba26
Nathan Binkert [Fri, 20 Feb 2004 16:29:39 +0000 (11:29 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/memory
--HG--
extra : convert_revision :
626baf73d2e26201088b05b4e5fac19292abcb32
Lisa Hsu [Thu, 19 Feb 2004 22:58:17 +0000 (17:58 -0500)]
interestingly, when setup is called from a perl script, when you chdir in the perl script, the ENV{PWD} does not change.
--HG--
extra : convert_revision :
e1b2fb3e3b791921b9c3f4bb3b7417ff047bbcbf
Andrew Schultz [Thu, 19 Feb 2004 02:38:55 +0000 (21:38 -0500)]
Change the physical memory logic, and also add misspeculation fix to
tlb index calls that are called from ExecContext::readIpr
arch/alpha/ev5.cc:
Fix misspeculation bugs for misspeculated IPR accesses
--HG--
extra : convert_revision :
c9ffcf9ef8123dfcaee1606c05aee8ad60d893d7
Nathan Binkert [Wed, 18 Feb 2004 19:17:44 +0000 (14:17 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/memory
--HG--
extra : convert_revision :
20e6f7edd432952b3c30d4f017058dfd52456fda
Nathan Binkert [Wed, 18 Feb 2004 19:17:13 +0000 (14:17 -0500)]
couple fixes
--HG--
extra : convert_revision :
bd0948bc831610f442d5ff6893f0e2a68e3aa83f
Nathan Binkert [Wed, 18 Feb 2004 17:01:04 +0000 (12:01 -0500)]
Merge
--HG--
extra : convert_revision :
b29c9bbb50994e2567fd58deedb853123d2d69a0
Erik Hallnor [Wed, 18 Feb 2004 03:53:15 +0000 (22:53 -0500)]
Add COW support to the IIC.
cpu/memtest/memtest.cc:
Move the trace Addr to the end of the printouts
--HG--
extra : convert_revision :
875f0a3f65e07f531a23fea6be07fbf3239ec2c4
Erik Hallnor [Tue, 17 Feb 2004 08:14:21 +0000 (03:14 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
19800f3879c943addbf4bca747b357a94352b6a8
Erik Hallnor [Tue, 17 Feb 2004 08:05:19 +0000 (03:05 -0500)]
Change the way data is handled in the cache blocks.
--HG--
extra : convert_revision :
8c071c4f48581a398bebc4f033e18580dca0897f
Andrew Schultz [Tue, 17 Feb 2004 02:56:38 +0000 (21:56 -0500)]
Change logic for translating a memory addresses, extra checks for invalid
physical addresses.
--HG--
extra : convert_revision :
efb4a5229d88cb3c024e0b24f5916048bd42d589
Erik Hallnor [Mon, 16 Feb 2004 21:28:11 +0000 (16:28 -0500)]
Rework BusBridge to have a latency and handle bus IDs correctly.
--HG--
extra : convert_revision :
901ef4782d0c9f0d842deba7acdba7896da7e41c
Erik Hallnor [Sat, 14 Feb 2004 08:25:39 +0000 (03:25 -0500)]
Add full copy support.
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
Add 2 new parameters to control the percentage of unaligned copy sources and destinations.
--HG--
extra : convert_revision :
2646ee2f195e9f3e76bc257b8716163ef63a9f40
Nathan Binkert [Fri, 13 Feb 2004 20:44:46 +0000 (15:44 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/memory
--HG--
extra : convert_revision :
99f5289f4143fb09c84694a51b3394d6699d927a
Nathan Binkert [Fri, 13 Feb 2004 20:36:21 +0000 (15:36 -0500)]
fix up vtophys a bit
arch/alpha/vtophys.cc:
fix up vtophys to deal with translations if there
is no ptbr, and to deal with PAL addresses
add ptomem which is just a wrapper for dma_addr
arch/alpha/vtophys.hh:
add ptomem which is a wrapper for dma_addr with the
same usage as vtomem
--HG--
extra : convert_revision :
1ae22073d400e87b708a4a7ef501124227fc6c39
Nathan Binkert [Thu, 12 Feb 2004 18:59:56 +0000 (13:59 -0500)]
better debugging
--HG--
extra : convert_revision :
504fc7174403aaeed0574a20587d4651c7351671
Nathan Binkert [Wed, 11 Feb 2004 21:07:55 +0000 (16:07 -0500)]
Add support for all devices to get requests from a timing memory bus.
In the future, this can be used for actual data, but for now, it's
so that devices can respond to timing accesses properly. This way,
an uncached access on a bus further away will take longer to respond.
dev/alpha_console.cc:
dev/alpha_console.hh:
suport the separate IO bus
--HG--
extra : convert_revision :
ececb70f5febfd00231f6e406f93b2a79be01261
Steve Reinhardt [Wed, 11 Feb 2004 05:44:08 +0000 (21:44 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
964126edcf72faf572a9272599264ba2f5cd7aa1
Steve Reinhardt [Wed, 11 Feb 2004 05:43:57 +0000 (21:43 -0800)]
Fixes for Linux syscall emulation.
arch/alpha/alpha_linux_process.cc:
Fixes for Linux emulation:
- stat struct alignment
- osf_{get,set}sysinfo return values
- additional syscall numbers
- initialize $r0 to 0
sim/syscall_emul.cc:
brk(0) just returns brk value (don't update it!)
--HG--
extra : convert_revision :
78e22458321c81e81540d101c9e65e2e4b0ad117
Erik Hallnor [Wed, 11 Feb 2004 01:37:38 +0000 (20:37 -0500)]
Add support for multiple outstanding aligned copies
cpu/memtest/memtest.cc:
Add traceBlockAddr to trace outputs.
--HG--
extra : convert_revision :
e4ebaf9647fb393448367f4f4af3bae566f51c24
Erik Hallnor [Mon, 9 Feb 2004 22:38:41 +0000 (17:38 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
0c018b88d6ca80b1690ec99d795014848e375e44
Erik Hallnor [Mon, 9 Feb 2004 22:37:27 +0000 (17:37 -0500)]
Add LRU aligned copies to the hierarchy, with only one outstanding copy. Aligned copies now fully work in LRU (just need to write the IIC doCopy call). At the moment they are slow since a stalled copy stalls the entire cache.
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
Add aligned copy tests, percent of copies is specified by percent_copies
--HG--
extra : convert_revision :
eaf1900fcb8832db98249e94e3472ebfb049eb48
Nathan Binkert [Mon, 9 Feb 2004 15:49:48 +0000 (10:49 -0500)]
- Whack unused code
- Make the MemoryController use address ranges (via Range) instead
of an address and a mask
base/remote_gdb.cc:
reflect name change
dev/alpha_access.h:
better include
dev/alpha_console.cc:
- FunctionalMemory no longer takes care of mapping my address into
the proper address space. It must be done locally.
- the memory controller no longer uses a mask, but a size, and the
size is determined by the device, not the .ini file
- fix up address calculations to reflect the removal of a mask
- PhysicalMemory::getSize() -> PhysicalMemory::size()
dev/alpha_console.hh:
- FunctionalMemory no longer takes care of mapping my address into
the proper address space. It must be done locally.
- the memory controller no longer uses a mask, but a size, and the
size is determined by the device, not the .ini file
- fix up address calculations to reflect the removal of a mask
- get rid of MmapDevice and inherit from FunctionalMemory
--HG--
extra : convert_revision :
e3a65c9debf6f899632d62c70781cbdc2826616b
Nathan Binkert [Mon, 9 Feb 2004 15:36:32 +0000 (10:36 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/memory
--HG--
extra : convert_revision :
9f385ee5b6958373a9a1bc600eb3e5e8b7987f38
Nathan Binkert [Mon, 9 Feb 2004 14:06:20 +0000 (09:06 -0500)]
Add that one IPR memory space address that we keep seeing
--HG--
extra : convert_revision :
81b365ac9ca8b33cae99107e5b1900f7c46f0866
Nathan Binkert [Mon, 9 Feb 2004 14:04:52 +0000 (09:04 -0500)]
random fixes
base/range.hh:
Add a constructor that takes the beginning and end as arguments
size returns T not a bool
quick make_range() function that is a shortcut for making a range
kinda like make_pair()
quick formatting fix
--HG--
extra : convert_revision :
94b1d462710e6fb55e72e1da2ad8c46993af1ef7
Steve Reinhardt [Mon, 9 Feb 2004 08:44:56 +0000 (00:44 -0800)]
Commit regenerated trace_flags.* based on merged traceflags.pl.
(bk auto merge messed these up...)
--HG--
extra : convert_revision :
5ebda321ab5ac4b85a1d846affa0035ded853b9d
Steve Reinhardt [Mon, 9 Feb 2004 08:32:21 +0000 (00:32 -0800)]
bk resolve is making me commit these even though they're broken.
--HG--
extra : convert_revision :
87b2c4a4a83eec7d696d9d84d14dbdc7532849f9
Steve Reinhardt [Mon, 9 Feb 2004 08:30:16 +0000 (00:30 -0800)]
Results of automatic (yet incomplete) merge.
--HG--
extra : convert_revision :
3ad9a929051bfe111a1e10618c8595acbbade542
Steve Reinhardt [Mon, 9 Feb 2004 08:22:43 +0000 (00:22 -0800)]
Add support for memory barriers.
arch/alpha/isa_desc:
Add cache port bindings for mb & wmb.
--HG--
extra : convert_revision :
72f76150fe471d0dc97bd41598cad4d86a035e39
Erik Hallnor [Sun, 8 Feb 2004 22:27:08 +0000 (17:27 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
b24970f5bbf817d6ef581114178e27f2ab7c3459
Erik Hallnor [Sun, 8 Feb 2004 22:26:27 +0000 (17:26 -0500)]
Separate template definitions and instantiations into *_impl.hh and *.cc. Eventually the *.cc fils should be generate by our super-duper python script.
base/compression/null_compression.hh:
Need some includes.
--HG--
extra : convert_revision :
caf52320f6f6ff255e8a93817419ad13ad44224f
Nathan Binkert [Sat, 7 Feb 2004 06:16:50 +0000 (01:16 -0500)]
Totally rework the Range class. Now the range is from [start, end)
to be consistent with the way that the stl works. It also makes
lots of other stuff easier. (Maybe those guys were smart?)
Overload the various comparison operators so that you can test
for overlapping of ranges, etc.
base/range.hh:
Totally rework the Range class. Now the range is from [start, end)
to be consistent with the way that the stl works. It also makes
lots of other stuff easier. (Maybe those guys were smart?)
Overload the various comparison operators so that you can test
for overlapping of ranges, etc.
make parse function private and offer operator= instead
isValid -> valid
and for you erik, I add comments
test/Makefile:
add range.o
test/rangetest.cc:
better tests
--HG--
extra : convert_revision :
dd58720aa3d02f20b03e933f2eaa3320c82bb27a
Nathan Binkert [Sat, 7 Feb 2004 00:47:19 +0000 (19:47 -0500)]
formatting
--HG--
extra : convert_revision :
0cea17bd3a517a1838006d89fac8a923e4576394
Nathan Binkert [Fri, 6 Feb 2004 23:59:12 +0000 (18:59 -0500)]
Small cleanup
--HG--
extra : convert_revision :
92f6dbd3d2c4336a0f03a9da5c390a7980ca08be
Erik Hallnor [Fri, 6 Feb 2004 05:13:44 +0000 (00:13 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
158117a2cba91b8cb04f41a418155149bcbba777
Erik Hallnor [Fri, 6 Feb 2004 05:13:26 +0000 (00:13 -0500)]
Various extraction of common code into separate functions to make life easier.
--HG--
extra : convert_revision :
ae303904e35975e65b4207f543ac93c9816e1f81
David Oehmke [Thu, 5 Feb 2004 17:16:17 +0000 (12:16 -0500)]
Modify the emulated system calls to support running the SPEC Int
benchmarks for alpha-linux.
arch/alpha/alpha_linux_process.cc:
Added some more ioctl commands to ignore.
Set unlink and rename to the new functions.
Ignore setrlimit, times and rt_sigaction.
Should eventually provide a function for times.
arch/alpha/alpha_tru64_process.cc:
Added some more ioctl commands to ignore.
Set unlink and rename to the new functions.
Ignore setrlimit.
sim/syscall_emul.cc:
Added implementations for unlink and rename.
sim/syscall_emul.hh:
Added unlink and rename functions.
Added a couple more ioctl requests to ignore.
Print out the PC of any ioctl commands that fail.
--HG--
extra : convert_revision :
8af21c7fa7d0645d3f9324c9ce70ad33590c3c8e
Steve Reinhardt [Thu, 5 Feb 2004 05:42:00 +0000 (21:42 -0800)]
Add support for "serializing" instructions that flush
execution pipeline (Alpha trapb & excb).
Add support for write memory barriers (mostly impacts
store buffer).
Add StaticInst flag to indicate memory barriers, though
this is not modeled in the pipeline yet.
arch/alpha/isa_desc:
Implement trapb, excb, mb, and wmb as insts with
no execution effect (empty execute() function) but
with flags that indicate their side effects.
Also make sure every instruction that needs to go to
the execute stage has a real opClass value, since we
are now using No_OpClass to signal insts that can get
dropped at dispatch.
StaticInst::branchTarget() is now a const method.
cpu/static_inst.hh:
Add flags to indicate serializing insts (trapb, excb) and
memory and write barriers.
Also declare some StaticInst methods as const methods.
dev/etherlink.hh:
sim/eventq.hh:
sim/serialize.cc:
sim/serialize.hh:
sim/sim_object.hh:
Make name() return value const.
--HG--
extra : convert_revision :
39520e71469fa20e0a7446b2e06b494eec17a02c
Erik Hallnor [Wed, 4 Feb 2004 21:55:17 +0000 (16:55 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
2f3653bbd0ab20308dcff5db176dc926402e9ad7
Erik Hallnor [Wed, 4 Feb 2004 21:55:05 +0000 (16:55 -0500)]
Change IIC to use param class. Tweak parameters in CacheTags.
--HG--
extra : convert_revision :
8239a7befe49c81b6b1f239fc478910441f64352