Commit graph

612 commits

Author SHA1 Message Date
Nathan Binkert
eabc59ca2d Initial cut at adding support to make the state machine
take time

--HG--
extra : convert_revision : f30ab2f00dd6f00ad8020912e709d057a2875526
2004-03-01 16:22:51 -05:00
Nathan Binkert
18d90037cb 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
2004-03-01 16:22:09 -05:00
Nathan Binkert
ad2f3f3a63 Support several memory configurations for hooking up devices
to memory in different configurations

--HG--
extra : convert_revision : 9e31c2fa96eeb42160cc0b892e10e6db58fe786b
2004-03-01 16:19:12 -05:00
Nathan Binkert
7a9cf40bbf add support for averaging
--HG--
extra : convert_revision : f0b5f622f96795a5d2160eeb2b52ecfd83170b67
2004-03-01 16:18:02 -05:00
Nathan Binkert
2aed8753dd Only need an execution context if we're doing data
--HG--
extra : convert_revision : 389a02fbf2f266e0c5e8ae07fd28138f7ebfc80c
2004-03-01 16:17:18 -05:00
Erik Hallnor
e943bedeaa Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : a9b6e6592e9c0f7e5cba45e148005647ea3539c4
2004-02-29 23:13:27 -05:00
Erik Hallnor
19c25e7c21 Fix an assert, only need the ExecContext if we are doing data,
--HG--
extra : convert_revision : 07f674613cb39ffe77dd66c2c9a77ed73b9d75b6
2004-02-29 23:13:04 -05:00
Nathan Binkert
123513ab0d Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : ba093baca9abfe311621e9589fcec0a892e9f9d1
2004-02-29 22:56:59 -05:00
Nathan Binkert
31ccbde829 Fix the swichover code. It's only for FULL_SYSTEM
cpu/base_cpu.cc:
    #ifdef FULL_SYSTEM

--HG--
extra : convert_revision : 427ee93d545596da00d6c4688a7e32d584054948
2004-02-29 22:56:42 -05:00
Erik Hallnor
cbc42f1d71 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
2004-02-29 22:41:11 -05:00
Nathan Binkert
7f688ba6a9 unused function name
--HG--
extra : convert_revision : ef2994f2d18a36580994b4fa7005e6dceb072b31
2004-02-29 21:35:12 -05:00
Nathan Binkert
133375d5b1 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
2004-02-29 21:34:25 -05:00
Nathan Binkert
ff516e8362 mark the request satisfied since well, it is.
--HG--
extra : convert_revision : 667c477b0b5ca45d63eaecabcf5119701584599f
2004-02-29 20:38:25 -05:00
Nathan Binkert
27b926c431 Avoid more bogus addresses
--HG--
extra : convert_revision : 25bc2adb78e2f96fb28b352a73401c3fa52eab03
2004-02-29 20:35:55 -05:00
Nathan Binkert
47421b8442 fix switchover WRT interrupts
cpu/base_cpu.cc:
    gah! copy the interrupt status on switchover

--HG--
extra : convert_revision : d3199a7409a494b7687354c43ffca697f37e8456
2004-02-29 20:32:30 -05:00
Nathan Binkert
0a3948bcfd 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
2004-02-29 20:25:52 -05:00
Nathan Binkert
ee96799519 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
2004-02-29 20:22:32 -05:00
Nathan Binkert
a574c260e3 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 48e5262fc37a5774b10a83e4c36a89c0ef2c8f15
2004-02-29 19:31:58 -05:00
Nathan Binkert
45f377bcd8 more debugging support
base/trace.cc:
    code to set/clear/print trace flags from the debugger.

--HG--
extra : convert_revision : f2a549e9af05c4a177186b9f1792a0493ce15c95
2004-02-29 19:29:30 -05:00
Nathan Binkert
31f82cef41 Make the progress event work even after restoring from a checkpoint
--HG--
extra : convert_revision : 80e31eb26250700ebe3ce5848e570068cc76ef47
2004-02-29 18:49:44 -05:00
Nathan Binkert
2272164d66 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
2004-02-29 17:05:23 -05:00
Erik Hallnor
b491bda241 Add support for multiple address ranges in memory interfaces.
dev/alpha_console.cc:
    setAddrRange -> addAddrRange

--HG--
extra : convert_revision : 9dc853b80bea443b54a130ca4c110a68077cb336
2004-02-29 16:18:49 -05:00
Nathan Binkert
27960f6d85 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
2004-02-29 14:54:52 -05:00
Steve Reinhardt
c79deda8cd 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
2004-02-28 17:21:32 -05:00
Erik Hallnor
cfb6f8fd01 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
2004-02-27 02:40:43 -05:00
Erik Hallnor
c3784e37ce 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
2004-02-27 00:45:21 -05:00
Nathan Binkert
81c1d76d01 fix
--HG--
extra : convert_revision : 67a9e36cda69da6b462e6a30d6daa047ce48fdde
2004-02-26 20:40:00 -05:00
Erik Hallnor
2399fb1196 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
2004-02-26 20:36:29 -05:00
Erik Hallnor
006fb9b421 Quick hack to allow rerequests for the future.
--HG--
extra : convert_revision : 4f1b080ae500dfd022c28e0cd7544c4fcfa5e330
2004-02-26 16:59:04 -05:00
Nathan Binkert
5e8631fd16 stoopid
--HG--
extra : convert_revision : ccd87a2de7f684bb3a4a448a307eb30afd363e12
2004-02-26 14:16:18 -05:00
Steve Reinhardt
40c350fcfe Merge.
--HG--
extra : convert_revision : e83f6895bceb0ced656e90275ec1a93d0af5498d
2004-02-26 07:08:45 -08:00
Steve Reinhardt
6f5e104fc5 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
2004-02-26 07:05:36 -08:00
Nathan Binkert
f8ad539aa5 Save the status of faulting write-hints so that they
won't accidentally be issued to the memory system.

--HG--
extra : convert_revision : 5696a09abcdee54c8bec72d9374f7944fb136740
2004-02-26 01:18:13 -05:00
Erik Hallnor
f93e9e063a Make this compile under non full system.
--HG--
extra : convert_revision : 6ae9b4af78cff3c8e5dc367fdbefad496a28857d
2004-02-25 21:32:37 -05:00
Lisa Hsu
752b6cf7c6 delay execContext registration from create() to init() callback in the sampling cpu also.
--HG--
extra : convert_revision : d3947c55f95bb03e73a815188a517043f39925d4
2004-02-25 18:25:20 -05:00
Nathan Binkert
a253251ae0 prevent bogus addresses from being sent to the memory system
--HG--
extra : convert_revision : 4f08f8c7ab380436b2ad2c30ba53d9fe305e4496
2004-02-25 16:16:17 -05:00
Nathan Binkert
087a2ed6a1 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 2a258d16ba51ce34f5748825a94b456abfb577cc
2004-02-25 16:13:00 -05:00
Nathan Binkert
b678152277 Fix stats debugging and always compile it in for the
debug target

--HG--
extra : convert_revision : aa16e6256a056e6df9affec6fd973e62e812e23c
2004-02-25 16:12:48 -05:00
Lisa Hsu
6a306d4caf 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
2004-02-24 14:59:25 -05:00
Steve Reinhardt
f9c91277f3 Quote args properly in tracediff.
util/tracediff:
    Quote simulator args so args with spaces get handled correctly.

--HG--
extra : convert_revision : b48677bc712be17e6e50ca35680e757ba9364692
2004-02-23 08:07:32 -08:00
Nathan Binkert
6d574e9cff 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
2004-02-23 02:49:09 -05:00
Nathan Binkert
cc863129b8 extend the hack by turning the address into a real
physical address

--HG--
extra : convert_revision : 9f752d5ab6def492056d4dfe0bda5eecb022ba80
2004-02-23 02:46:47 -05:00
Nathan Binkert
220952d592 Don't issue memory requests for bogus addresses
--HG--
extra : convert_revision : 786b7fa503436f9a269ebeaedf152c6364874ab5
2004-02-23 02:46:04 -05:00
Nathan Binkert
052e0e3116 Make this like PCI-X
--HG--
extra : convert_revision : 59eaf2c548a88df075b13e78aaa7a4377f20e6c8
2004-02-23 02:44:22 -05:00
Nathan Binkert
bc5ed80b32 configurable latency for programmed IO
fix serialization

dev/etherlink.cc:
    fix serialization

--HG--
extra : convert_revision : 6739001f3f97b745d9874bb4c5729cc4909625c2
2004-02-22 18:09:11 -05:00
Nathan Binkert
e067bc751b 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
2004-02-21 10:46:31 -05:00
Nathan Binkert
610081079c 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
2004-02-21 10:43:37 -05:00
Nathan Binkert
a1259a4fcf 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
2004-02-20 15:24:21 -05:00
Nathan Binkert
ec06c63cc7 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
2004-02-20 15:23:27 -05:00
Nathan Binkert
695d51e513 make uncacheable stuff happen again
cpu/simple_cpu/simple_cpu.cc:
    Allow requests to be uncacheable

--HG--
extra : convert_revision : 7ab1442f2eec3763d5bc6a6f37b11f663851b12c
2004-02-20 15:22:41 -05:00