gem5.git
20 years agoMerge zizzer:/bk/linux
Andrew Schultz [Tue, 11 May 2004 22:09:45 +0000 (18:09 -0400)]
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux

--HG--
extra : convert_revision : 879834af81a124b1f1b546f1591713a8c36913e4

20 years agoChanges to fix bad DMA handling by disk when using scatter gather page
Andrew Schultz [Tue, 11 May 2004 22:06:50 +0000 (18:06 -0400)]
Changes to fix bad DMA handling by disk when using scatter gather page
mappings (writes still unverified, and read could probably be looked over
a bit more too)

dev/ide_disk.cc:
dev/ide_disk.hh:
    Major changes to fix bogus handling of dma transfers.  The read seems to
    work pretty well, but the write is unverfied until we can get a disk
    image that actually tries to write.
dev/tsunami_pchip.cc:
    Change mask to properly mask 13 bits not 12

--HG--
extra : convert_revision : 08fe9bc32970e449cd045de479553a96a4e389d6

20 years agoAdded ULL for 64bit ints
Ali Saidi [Mon, 10 May 2004 00:14:18 +0000 (20:14 -0400)]
Added ULL for 64bit ints
Added function to skip determine_cpu_caches(). We may have to update this in the
future: see note below.

arch/alpha/alpha_memory.cc:
dev/ide_ctrl.cc:
dev/tsunamireg.h:
    Added ULL for 64bit ints
kern/linux/linux_system.cc:
    Added a function to skip determine_cpu_caches, right now it is only used for
    printing in proc, however in the future we may either want to implement the SC_CTL
    IPR register or manually set alpha_l1i_cacheshape, alpha_l1d_cacheshape,
    alpha_l2_cacheshape, alpha_l3_cacheshape to ((size << 10) | (linesize>>1)<<4 | way)
kern/linux/linux_system.hh:
    added event to skip determine_cpu_caches()

--HG--
extra : convert_revision : 1065f2091bbe6832b730af490f5b4672c2afedce

20 years agoWhole mess'o'changes.. see individual files
Andrew Schultz [Thu, 6 May 2004 19:21:07 +0000 (15:21 -0400)]
Whole mess'o'changes.. see individual files

arch/alpha/vtophys.cc:
    Removed buggy code that tries to fix PAL addresses (may cause problems
    while trying to debug in PAL code, but that should do this fix outside
    of vtophys)
base/loader/symtab.cc:
base/loader/symtab.hh:
cpu/exetrace.cc:
    Changed InstExec traces to always print a symbol name
dev/ide_ctrl.cc:
dev/ide_disk.cc:
    Tabs
dev/ide_disk.hh:
    Change buffer size
dev/tsunami_pchip.cc:
    Fix translatePciToDma to support scatter gather mapping
kern/linux/linux_system.cc:
    Force simulator to wait until remote debugger attaches (should be removed
    or turned on/off with a flag)

--HG--
extra : convert_revision : 1d08aebe3f448c87a963dd613de3e2e0cff0d48d

20 years agoMerge zizzer:/bk/linux
Andrew Schultz [Mon, 3 May 2004 15:48:17 +0000 (11:48 -0400)]
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux

--HG--
extra : convert_revision : 8eca0fba9d96bffea7a24bce9b14f0284bd58c83

20 years agoCheckin of latest IDE and some separation between platforms (Tsunami and
Andrew Schultz [Mon, 3 May 2004 15:47:52 +0000 (11:47 -0400)]
Checkin of latest IDE and some separation between platforms (Tsunami and
Turbolaser)

base/range.hh:
    Change semantics of range to be inclusive of the end value, may need to
    check other users of range to make sure they are semantically correct.
    This was needed for access of last byte in range of address on IDE and
    makes sense for case of range from 0 to all f
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
    Whole mess of changes.. at current state simulator will boot and read
    partition table and then have a bunch of errors and panic
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/platform.hh:
    Changes to work with platform separation
dev/tsunami.cc:
dev/tsunami.hh:
    Change to work with platform separation

--HG--
extra : convert_revision : e1de22b54df7fdcf391efc2a8555ada93f46beab

20 years agojust comment ns_gige.cc a little more
Lisa Hsu [Wed, 21 Apr 2004 22:43:39 +0000 (18:43 -0400)]
just comment ns_gige.cc a little more

dev/ns_gige.cc:
    add some comments

--HG--
extra : convert_revision : 96ae82f1f48b8e2e2ba8a6a0e2f37d8f992d15b3

20 years agoThis is where I'm at for Linux Ethernet before I head to Mexico.
Lisa Hsu [Wed, 21 Apr 2004 22:23:41 +0000 (18:23 -0400)]
This is where I'm at for Linux Ethernet before I head to Mexico.

base/range.hh:
    andrew thought this might be a bug.
dev/etherpkt.cc:
    don't need std:: since there is a using directive
dev/ns_gige.cc:
    update to new PIO and PCI system
dev/ns_gige.hh:
    update to deal with new PIO and PCI setup
dev/ns_gige_reg.h:
    Add some new #defines that I ended up needing
dev/pcidev.cc:
    some changes to the debugging printfs of pci device

--HG--
extra : convert_revision : 955ba8e8e1c418cfe1c6549dc3451ea091541556

20 years agoMerge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux
Lisa Hsu [Tue, 23 Mar 2004 22:11:19 +0000 (17:11 -0500)]
Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux

--HG--
extra : convert_revision : 69440981a018ce8b7c1c8a73404da0a39faa3ac3

20 years agoAdd initial support for IDE
Andrew Schultz [Tue, 23 Mar 2004 22:10:07 +0000 (17:10 -0500)]
Add initial support for IDE

--HG--
extra : convert_revision : e07dc6c87b0b692d428b541d4032fcf82996ef15

20 years agoMerge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux
Lisa Hsu [Mon, 22 Mar 2004 22:11:36 +0000 (17:11 -0500)]
Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux

--HG--
extra : convert_revision : 7af5650ceae277ce838e778bba1fba86285d6dca

20 years agoAutomerge
Andrew Schultz [Mon, 22 Mar 2004 21:59:43 +0000 (16:59 -0500)]
Automerge

--HG--
extra : convert_revision : d79abea2623f31a27735640363dfbf655c226b62

20 years agoChange member variable names to lower case
Andrew Schultz [Mon, 22 Mar 2004 21:58:18 +0000 (16:58 -0500)]
Change member variable names to lower case

--HG--
extra : convert_revision : 390c30b8313e7acbd7d77b106716f7147d181111

20 years agoChanged to inherit from DmaDevice to avoid multiple inheritance (now
Andrew Schultz [Mon, 22 Mar 2004 21:50:09 +0000 (16:50 -0500)]
Changed to inherit from DmaDevice to avoid multiple inheritance (now
assumes that all PCI devices are DmaDevices, and if not, they can just
ignore the DMA stuff)

--HG--
extra : convert_revision : aa58b658370696674ca4c32b265bc0400e5dda5a

20 years agoMerge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux
Lisa Hsu [Mon, 22 Mar 2004 18:21:18 +0000 (13:21 -0500)]
Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux

--HG--
extra : convert_revision : b4e2fc55ec9cd0caa7cdf02de8a61c66e8b35c67

20 years agoforgot to check this in earlier - no confusion between types and member names!
Lisa Hsu [Mon, 22 Mar 2004 18:15:14 +0000 (13:15 -0500)]
forgot to check this in earlier - no confusion between types and member names!

dev/pcidev.cc:
    member variables should begin with lowercase so they don't get confused with types.
dev/pcidev.hh:
    member variables must begin with lowercase so they don't get confused with types.

--HG--
extra : convert_revision : f083baa60d0fbf64d858d684ff70ee06e7b7765d

20 years agoMake it so that alpha_console can read the frequency from the correct
Ron Dreslinski [Fri, 19 Mar 2004 19:51:02 +0000 (14:51 -0500)]
Make it so that alpha_console can read the frequency from the correct
sim object(depends on which platform tsunami/tlaser is being used)

dev/alpha_console.cc:
    Use dynamice casting once during build to get at the proper device to calculate the frequency.
    It is either a tsunami_IO or a tlaser_clock depending on platform (tsunami/tlaser).
    If the simobject is not of either of those types then panic
dev/alpha_console.hh:
    Pass in a SimObject * that is to either a tlaser_clock or a tsunami_IO
sim/sim_object.cc:
    Make it so that you can have a SimObjectParam of type SimObject:

    example:
    SimObjectParam<SimObject *> so;

--HG--
extra : convert_revision : 08239ef23762b8ea11311630b73fe885d939402e

20 years agoUpdated kern/* code so we can have one console code and the simulator
Ali Saidi [Wed, 17 Mar 2004 21:12:13 +0000 (16:12 -0500)]
Updated kern/* code so we can have one console code and the simulator
changes the HWRPB to the correct system type/variation.

kern/linux/linux_system.cc:
kern/tru64/tru64_system.cc:
    Added code to change system type/variation so that we can have one console

--HG--
extra : convert_revision : 5f35f7d965419cd3038e2e85e05a20884b2f6068

20 years agomerge etherpkt and makefile
Lisa Hsu [Fri, 12 Mar 2004 16:07:32 +0000 (11:07 -0500)]
merge etherpkt and makefile

--HG--
extra : convert_revision : 8f416468c7c239a4de6f8df2d632832921c1ced8

20 years agofirst pass at ns_ethernet device. more will come later as i merge in nate's new...
Lisa Hsu [Fri, 12 Mar 2004 16:04:58 +0000 (11:04 -0500)]
first pass at ns_ethernet device.  more will come later as i merge in nate's new ether infrastructure.

dev/etherpkt.hh:
    add some stuff for support of the NS ethernet device.

--HG--
extra : convert_revision : 51f6508463b6394055e3428a42b7de490a9ae6c1

20 years agomerge from head of m5. note: i did not bother to merge the PIO stuff with scsi...
Lisa Hsu [Fri, 12 Mar 2004 01:04:41 +0000 (20:04 -0500)]
merge from head of m5.  note:  i did not bother to merge the PIO stuff with scsi since we're not going that route anymore anyway.  esp because it was giving me an error i couldn't seem to fix.

dev/alpha_console.cc:
    missed this >>>> after i merged
kern/linux/linux_system.cc:
    get rid of FS_MEASURES and change FnEvent to LinuxFnEvent
kern/linux/linux_system.hh:
    get rid of FS_MEASURE

--HG--
extra : convert_revision : 210f46573bba0c772a224ce110af9a9230fabf6a

20 years agomerge with m5 head
Lisa Hsu [Thu, 11 Mar 2004 23:52:29 +0000 (18:52 -0500)]
merge with m5 head

--HG--
extra : convert_revision : c90339248d1ee74df1c6b90a77ec9ea41f646311

20 years agotraceflags merge
Lisa Hsu [Thu, 11 Mar 2004 23:47:29 +0000 (18:47 -0500)]
traceflags merge

--HG--
extra : convert_revision : f8427ed6caa815500cbb0ce648f2495a2d039082

20 years agoIt was annoying me that there was PCIConfigAll and PciDev and PciConfigData. so...
Lisa Hsu [Thu, 11 Mar 2004 17:45:27 +0000 (12:45 -0500)]
It was annoying me that there was PCIConfigAll and PciDev and PciConfigData.  so for consistency I changed it.

dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami.hh:
    change PCIConfigAll to PciConfigAll

--HG--
extra : convert_revision : d2fa3f59b906c870fd9d46cfa94728c7587e3652

20 years agoPerformance improvement for unaligned copy
Erik Hallnor [Sun, 7 Mar 2004 06:26:16 +0000 (01:26 -0500)]
Performance improvement for unaligned copy

--HG--
extra : convert_revision : 36a67874c119c4ef5dbd6692292dae1a5dcfded0

20 years agochange the naming of MainBins. didn't check this in before because i had random...
Lisa Hsu [Sat, 6 Mar 2004 00:18:58 +0000 (19:18 -0500)]
change the naming of MainBins.  didn't check this in before because i had random debug statements i didn't want to push along with it.

kern/tru64/tru64_system.cc:
    change the naming of Bins, add some DPRINTFs

--HG--
extra : convert_revision : 65eeb61caa3132adc45972feff891e4a969c06c5

20 years agofix ALPHA
Lisa Hsu [Fri, 5 Mar 2004 20:15:23 +0000 (15:15 -0500)]
fix ALPHA

cpu/exec_context.cc:
    put this code between #ifdef FULL_SYSTEM

--HG--
extra : convert_revision : b934c7085d2a4337149ab8180a7d50851fbbf170

20 years agochanges that affect post checkpoint runs.
Lisa Hsu [Fri, 5 Mar 2004 13:16:33 +0000 (08:16 -0500)]
changes that affect post checkpoint runs.

cpu/exec_context.cc:
    you can't delete an element of an array that you newed.  oops.
kern/tru64/tru64_events.cc:
    changes to reflect .ini changes, and also b/c es_intr and ipintr can happen at ANY point, even within a current calling path being tracked.
sim/system.cc:
    can't delete an element of a newed array.  must new them separately.

--HG--
extra : convert_revision : 21573327b7b7f20bf9a3fcfb5854526433e17e17

20 years agobin user and kernel stats
Lisa Hsu [Fri, 5 Mar 2004 11:15:30 +0000 (06:15 -0500)]
bin user and kernel stats

--HG--
extra : convert_revision : 66e6181ad3e8b6567da9f2b82d87e7af49f28eaf

20 years agonother fix
Lisa Hsu [Fri, 5 Mar 2004 11:14:33 +0000 (06:14 -0500)]
nother fix

cpu/exec_context.cc:
    nother little bug...forgot to pop off stack as i read off it
sim/system.cc:
    forgot to pop off stack as i read off it

--HG--
extra : convert_revision : d1f691c0a9f0fa22281c717ee465d8a5f1e45c13

20 years agoMerge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/work/bk/bincleanup
Lisa Hsu [Fri, 5 Mar 2004 10:54:54 +0000 (05:54 -0500)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/work/bk/bincleanup

--HG--
extra : convert_revision : e4303df381e5f397d15c37eb05377be1860f89be

20 years agoforgot to check this in
Lisa Hsu [Fri, 5 Mar 2004 10:54:46 +0000 (05:54 -0500)]
forgot to check this in

--HG--
extra : convert_revision : 3090da3ab1077736bae52519143b44b08dd5ddb9

20 years agoMerge zizzer.eecs.umich.edu:/bk/m5
Nathan Binkert [Fri, 5 Mar 2004 10:50:33 +0000 (05:50 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 51b3fd809a77e146b8370636b2cc60ddf1075195

20 years agoDon't dump an ethertrace by default
Nathan Binkert [Fri, 5 Mar 2004 10:50:19 +0000 (05:50 -0500)]
Don't dump an ethertrace by default
Update the system dir for the addition of parallel and dirty netperf

--HG--
extra : convert_revision : e46efb32e0d6c21047507d444d41e7d55fbfb770

20 years agoMake payload splitting accessible with a #define
Nathan Binkert [Fri, 5 Mar 2004 10:49:49 +0000 (05:49 -0500)]
Make payload splitting accessible with a #define

--HG--
extra : convert_revision : 90b86b270a84cffaf3d13a2b83c04f33bb442e44

20 years agoadd a mechanism for delayed interrupts (aka. interrupt coalescing)
Nathan Binkert [Fri, 5 Mar 2004 10:48:56 +0000 (05:48 -0500)]
add a mechanism for delayed interrupts (aka. interrupt coalescing)
re-do fixed dma latency

--HG--
extra : convert_revision : b91e6b69682f66e424782e89500d3ad47b797e25

20 years agoAdd support for a propagation delay on the link. The electrical
Nathan Binkert [Fri, 5 Mar 2004 10:47:05 +0000 (05:47 -0500)]
Add support for a propagation delay on the link.  The electrical
delay is more or less folded into the packet time, but an additional
delay is possible representing crossing a long haul link, or some
switches, etc.

--HG--
extra : convert_revision : 8fd689c2a7e3051e77f47a4cd5f51c6999d92c8f

20 years agoconstructor option to make the wrapped event autodelete
Nathan Binkert [Fri, 5 Mar 2004 10:45:45 +0000 (05:45 -0500)]
constructor option to make the wrapped event autodelete

--HG--
extra : convert_revision : 8663c874c533685adf21eea968b08b40b7d7b665

20 years agouse %#x so we know that it is hex
Nathan Binkert [Fri, 5 Mar 2004 10:44:46 +0000 (05:44 -0500)]
use %#x so we know that it is hex

--HG--
extra : convert_revision : 7da77cd9a16ba70eeb0382c3c79b1475554a2d4c

20 years agoadd ticks per picosecond
Nathan Binkert [Fri, 5 Mar 2004 10:44:11 +0000 (05:44 -0500)]
add ticks per picosecond

--HG--
extra : convert_revision : 1585e7f89340b941e699db6b81080af58500a7c2

20 years agosmall bugfix, forgot to increment iter
Lisa Hsu [Fri, 5 Mar 2004 10:38:04 +0000 (05:38 -0500)]
small bugfix, forgot to increment iter

sim/system.cc:
    oops, forgot to increment iter.

--HG--
extra : convert_revision : 95fcd337d00157ccf072f0eb301b76f280480839

20 years agoserialization for binning. it is WAAAAAAAY past my bedtime.
Lisa Hsu [Fri, 5 Mar 2004 10:09:05 +0000 (05:09 -0500)]
serialization for binning.  it is WAAAAAAAY past my bedtime.

cpu/exec_context.cc:
sim/system.cc:
sim/system.hh:
    serialization for binning

--HG--
extra : convert_revision : f8417794a3a5ec7f2addc9c2da0f48e851899112

20 years agoMerge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/work/bk/bincleanup
Lisa Hsu [Fri, 5 Mar 2004 02:57:17 +0000 (21:57 -0500)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/work/bk/bincleanup

--HG--
extra : convert_revision : 7b5dc465231a861f0b460e3cbf9ee2ad2b2f5246

20 years agoOverall gist of this is to 'dynamicize' the tracking of functions so you can choose...
Lisa Hsu [Fri, 5 Mar 2004 02:57:09 +0000 (21:57 -0500)]
Overall gist of this is to 'dynamicize' the tracking of functions so you can choose them at the .ini stage rather than at compile time.

to do it:
in .ini file set binned_fns=foo null bar foo

what this says is, track foo when it is called by null (i.e. anything).  bin bar only when it is called by foo.
essentially, if you have a path of functions to track, the 0th, 2nd, 4th fn listed are the fns to track, and the 1st, 3rd, 5th are their respective callers.

base/statistics.hh:
    turn it back to FS_MEASURE since we already have a build in place
kern/tru64/tru64_events.cc:
    remove FS_MEASURE #defs.  add more DPRINTF's.  manage an anomaly that happens when tracking idle_thread.
kern/tru64/tru64_events.hh:
    remove FS_MEASURE #defs
kern/tru64/tru64_system.cc:
    make DumpState print all the time, but only with DPRINTF.  add a new parameter to tru64System a vector<string> binned_fns, to read in from .ini file.  now all this binning stuff is dynamically generated.
kern/tru64/tru64_system.hh:
    remove all static binning stuff, add support for dynamic
sim/system.cc:
    change nonPath bin name to Kernel, remove FS_MEASURE
sim/system.hh:
    change nonPath to Kernel

--HG--
extra : convert_revision : 9ee813c0a64273bab4125815b7bc8145c5897ec1

20 years agoReenable functioning copies.
Erik Hallnor [Fri, 5 Mar 2004 01:03:38 +0000 (20:03 -0500)]
Reenable functioning copies.

arch/alpha/isa_desc:
    Reenable copies.

--HG--
extra : convert_revision : 99259c0ff65e742e617cba1c14f5d1bf4be2fee8

20 years agoAutomerged
Erik Hallnor [Thu, 4 Mar 2004 20:06:34 +0000 (15:06 -0500)]
Automerged

--HG--
extra : convert_revision : 7b56535ee32551f27db8d98172159f63e5099835

20 years agoCopy implementations
Erik Hallnor [Thu, 4 Mar 2004 19:57:57 +0000 (14:57 -0500)]
Copy implementations

arch/alpha/isa_desc:
    Need to return fault for copy operations.
cpu/exec_context.hh:
    Add temporary storage to pass source address from copy load to copy store
cpu/simple_cpu/simple_cpu.cc:
    Implement copy functions.
cpu/simple_cpu/simple_cpu.hh:
    Return fault

--HG--
extra : convert_revision : 98e5ce563449d6057ba45c70eece9235f1649a90

20 years agoScript and ini file for new specweb images (the threaded ones)
Andrew Schultz [Wed, 3 Mar 2004 03:02:33 +0000 (22:02 -0500)]
Script and ini file for new specweb images (the threaded ones)

--HG--
extra : convert_revision : 82f66462bb2607e427db40147d7f8cc705ed3853

20 years agoAdd some stats to track latencies of small and large DMA transactions.
Erik Hallnor [Tue, 2 Mar 2004 23:45:08 +0000 (18:45 -0500)]
Add some stats to track latencies of small and large DMA transactions.

--HG--
extra : convert_revision : 1792d396f00bd24e9577f7883461b389e96ef803

20 years agoReduce redundant code, fix so that if the dma request is only as big as
Ron Dreslinski [Tue, 2 Mar 2004 20:13:01 +0000 (15:13 -0500)]
Reduce redundant code, fix so that if the dma request is only as big as
the header, and fix so that it doesn't keep requesting the payload bus
if the sendRequest was unsuccesful.

--HG--
extra : convert_revision : 7fda85ccf38ea99a457ae0d6902704cb2ba053cd

20 years agoMake sure to arbitrate for the payload bus in the header splitting case,
Ron Dreslinski [Tue, 2 Mar 2004 17:59:24 +0000 (12:59 -0500)]
Make sure to arbitrate for the payload bus in the header splitting case,
and to free up the header bus by returning false.  If there is no
header splitting it will work normally.

--HG--
extra : convert_revision : 4f6dd07e33e510502806256b1b8089d85d600233

20 years agoAdd more statistics about dma requests, shorten names for easier readability
Ron Dreslinski [Tue, 2 Mar 2004 07:49:19 +0000 (02:49 -0500)]
Add more statistics about dma requests, shorten names for easier readability
of stats

--HG--
extra : convert_revision : 052a03c3e7a6b4b4ee000f291332bdec59c94f96

20 years agoAdd a name parameter so the statistics work properly
Ron Dreslinski [Tue, 2 Mar 2004 07:21:15 +0000 (02:21 -0500)]
Add a name parameter so the statistics work properly

--HG--
extra : convert_revision : 5ea9d5c5f0a0e19afe6956e004113d87d347d698

20 years agoAdd statistics to calculate average round-trip delay for DMA
Ron Dreslinski [Tue, 2 Mar 2004 06:04:12 +0000 (01:04 -0500)]
Add statistics to calculate average round-trip delay for DMA

--HG--
extra : convert_revision : 1aa436e4dc2981444b4aab102c24c99f5b3280cd

20 years agoChange ini again because I messed up the resolve
Ron Dreslinski [Tue, 2 Mar 2004 02:38:33 +0000 (21:38 -0500)]
Change ini again because I messed up the resolve

--HG--
extra : convert_revision : f46902ec51e0db3f4dcfedc4937c8f9504074463

20 years agoAuto merged
Ron Dreslinski [Tue, 2 Mar 2004 02:26:21 +0000 (21:26 -0500)]
Auto merged

--HG--
extra : convert_revision : 607177f165a6057de8befd554d31478bbda55239

20 years agoAdd support for two buses to the DMA, allows header splitting
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

20 years agoInitial cut at adding support to make the state machine
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

20 years agoUse #define CPU_10GHZ and CPU_4GHZ. This should get fixed when
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

20 years agoSupport several memory configurations for hooking up devices
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

20 years agoadd support for averaging
Nathan Binkert [Mon, 1 Mar 2004 21:18:02 +0000 (16:18 -0500)]
add support for averaging

--HG--
extra : convert_revision : f0b5f622f96795a5d2160eeb2b52ecfd83170b67

20 years agoOnly need an execution context if we're doing data
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

20 years agoMerge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
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

20 years agoFix an assert, only need the ExecContext if we are doing data,
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

20 years agoMerge zizzer.eecs.umich.edu:/bk/m5
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

20 years agoFix the swichover code. It's only for FULL_SYSTEM
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

20 years agoRemove copys from isa_desc, and implement a store and forward bus bridge
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

20 years agounused function name
Nathan Binkert [Mon, 1 Mar 2004 02:35:12 +0000 (21:35 -0500)]
unused function name

--HG--
extra : convert_revision : ef2994f2d18a36580994b4fa7005e6dceb072b31

20 years agomake it so that we can prevent descriptor DMAs or
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

20 years agomark the request satisfied since well, it is.
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

20 years agoAvoid more bogus addresses
Nathan Binkert [Mon, 1 Mar 2004 01:35:55 +0000 (20:35 -0500)]
Avoid more bogus addresses

--HG--
extra : convert_revision : 25bc2adb78e2f96fb28b352a73401c3fa52eab03

20 years agofix switchover WRT interrupts
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

20 years agoMerge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
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

20 years agoInitial cleanup pass of lisa's function call tracking
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

20 years agoMerge zizzer.eecs.umich.edu:/bk/m5
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

20 years agomore debugging support
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

20 years agoMake the progress event work even after restoring from a checkpoint
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

20 years agoFix dumping to work on the opteron. struct timeval can
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

20 years agoAdd support for multiple address ranges in memory interfaces.
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

20 years agofix rpcc
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

20 years agoFix handling of rpcc in full-system mode.
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

20 years agoAdded copy instructions to the ISA. Well it didn't break anything yet...
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

20 years agoInitial copy support in the pipeline. Add copypal counting.
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

20 years agofix
Nathan Binkert [Fri, 27 Feb 2004 01:40:00 +0000 (20:40 -0500)]
fix

--HG--
extra : convert_revision : 67a9e36cda69da6b462e6a30d6daa047ce48fdde

20 years agoThe DMAInterface was never updated to the new blocking model. Need to hold the reques...
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

20 years agoQuick hack to allow rerequests for the future.
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

20 years agostoopid
Nathan Binkert [Thu, 26 Feb 2004 19:16:18 +0000 (14:16 -0500)]
stoopid

--HG--
extra : convert_revision : ccd87a2de7f684bb3a4a448a307eb30afd363e12

20 years agoMerge.
Steve Reinhardt [Thu, 26 Feb 2004 15:08:45 +0000 (07:08 -0800)]
Merge.

--HG--
extra : convert_revision : e83f6895bceb0ced656e90275ec1a93d0af5498d

20 years agoMake SW prefetch flag a parameter again, and add code to make
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

20 years agoSave the status of faulting write-hints so that they
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

20 years agoMake this compile under non full system.
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

20 years agodelay execContext registration from create() to init() callback in the sampling cpu...
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

20 years agoprevent bogus addresses from being sent to the memory system
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

20 years agoMerge zizzer.eecs.umich.edu:/bk/m5
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

20 years agoFix stats debugging and always compile it in for the
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

20 years agoadd in an init() callback for CPU's so that no stats are accessed prior to the end...
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

20 years agoQuote args properly in tracediff.
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

20 years agoOnly one request may be on the dma interface at a time,
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

20 years agoextend the hack by turning the address into a real
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

20 years agoDon't issue memory requests for bogus addresses
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