gem5.git
18 years agoChange rename to rename the flattened register index instead of the architectural...
Gabe Black [Wed, 6 Dec 2006 10:55:23 +0000 (05:55 -0500)]
Change rename to rename the flattened register index instead of the architectural one.

--HG--
extra : convert_revision : 757866ad7a3c8be7382e1ffa71c60bc00c861f6f

18 years agoAdded in endianness conversion on memory accesses as the data goes out. This will...
Gabe Black [Wed, 6 Dec 2006 10:54:16 +0000 (05:54 -0500)]
Added in endianness conversion on memory accesses as the data goes out. This will break the checker!

--HG--
extra : convert_revision : b8191cab09ab8f3ced05693293f058382319ed8e

18 years agoChange how optional delay slot instructions are detected and squashed.
Gabe Black [Wed, 6 Dec 2006 10:51:18 +0000 (05:51 -0500)]
Change how optional delay slot instructions are detected and squashed.

--HG--
extra : convert_revision : ffd019d4adc2fbbc0a663d8dc6ef73edce12511b

18 years agoGet rid of some typedefs which were hardly used, and move some stuff back here that...
Gabe Black [Wed, 6 Dec 2006 10:48:59 +0000 (05:48 -0500)]
Get rid of some typedefs which were hardly used, and move some stuff back here that shouldn't be in the architecture specific DynInst classes.

--HG--
extra : convert_revision : dad0d7191acf773c16dc3ed9dd911f5e8bfc08b3

18 years agoChange to use -return_value.value like other implementations.
Gabe Black [Wed, 6 Dec 2006 10:47:19 +0000 (05:47 -0500)]
Change to use -return_value.value like other implementations.

--HG--
extra : convert_revision : 513422c1c8c24f3662e6a423d13ee033424aa44b

18 years agoSome changes for misc regs which were changed into unofficial integer registers,...
Gabe Black [Wed, 6 Dec 2006 10:46:44 +0000 (05:46 -0500)]
Some changes for misc regs which were changed into unofficial integer registers, and moved the flattenIndex function into the register file.

--HG--
extra : convert_revision : 6b797c793a6c12c61a23f0f78a1ea1c88609553e

18 years agoReorganize the includes and add an include for misc.hh.
Gabe Black [Wed, 6 Dec 2006 10:45:18 +0000 (05:45 -0500)]
Reorganize the includes and add an include for misc.hh.

--HG--
extra : convert_revision : 484b2d07a1e8b3879c35d80bf16b73fd0cc9be1f

18 years agoAdded some debug output, and made sure not to accidentally ask for the result of...
Gabe Black [Wed, 6 Dec 2006 10:44:31 +0000 (05:44 -0500)]
Added some debug output, and made sure not to accidentally ask for the result of a store conditional.

--HG--
extra : convert_revision : d36ff9e2343fdf78a3bc16a1348975fdba5c55e2

18 years agoSome basic fix ups, and CWP is no longer set explicitly.
Gabe Black [Wed, 6 Dec 2006 10:43:25 +0000 (05:43 -0500)]
Some basic fix ups, and CWP is no longer set explicitly.

--HG--
extra : convert_revision : 1dde5594a2bcfd9fb5ad974360b3dc035f1624e5

18 years agoChanged the integer register file to work with flattened indices.
Gabe Black [Wed, 6 Dec 2006 10:42:09 +0000 (05:42 -0500)]
Changed the integer register file to work with flattened indices.

--HG--
extra : convert_revision : c5153c3c712e5d18b5233e1fd205806adcb30654

18 years agoChange MIPS's setSyscallReturn to use a thread context.
Gabe Black [Wed, 6 Dec 2006 10:41:08 +0000 (05:41 -0500)]
Change MIPS's setSyscallReturn to use a thread context.

--HG--
extra : convert_revision : 618f8404ec5380615e28170d761b2fcdf9c07d96

18 years agoAdded basic flatten function for mips.
Gabe Black [Wed, 6 Dec 2006 10:40:11 +0000 (05:40 -0500)]
Added basic flatten function for mips.

--HG--
extra : convert_revision : 2c32851584001734d139f36c4d58c5e61067fcfc

18 years agoMove the SyscallReturn class into sim/syscallreturn.hh. Also move some miscregs into...
Gabe Black [Tue, 5 Dec 2006 06:55:02 +0000 (01:55 -0500)]
Move the SyscallReturn class into sim/syscallreturn.hh. Also move some miscregs into the integer register file so they get renamed.

src/arch/alpha/syscallreturn.hh:
src/arch/mips/syscallreturn.hh:
src/sim/syscallreturn.hh:
    Move the SyscallReturn class into sim/syscallreturn.hh
src/arch/sparc/faults.cc:
src/arch/sparc/isa/operands.isa:
src/arch/sparc/isa_traits.hh:
src/arch/sparc/miscregfile.cc:
src/arch/sparc/miscregfile.hh:
src/arch/sparc/process.cc:
src/arch/sparc/sparc_traits.hh:
    Move some miscregs into the integer register file so they get renamed.

--HG--
extra : convert_revision : df5b94fa1e7fdca34816084e0a423d6fdf86c79b

18 years agoInitial changes to get O3 working with SPARC
Gabe Black [Sat, 25 Nov 2006 03:06:33 +0000 (22:06 -0500)]
Initial changes to get O3 working with SPARC

src/arch/sparc/process.cc:
    MachineBytes doesn't exist any more.
src/arch/sparc/regfile.cc:
    Add in the miscRegFile for good measure.
src/cpu/o3/isa_specific.hh:
    Add in a section for SPARC
src/cpu/o3/sparc/cpu.cc:
src/cpu/o3/sparc/cpu.hh:
src/cpu/o3/sparc/cpu_builder.cc:
src/cpu/o3/sparc/cpu_impl.hh:
src/cpu/o3/sparc/dyn_inst.cc:
src/cpu/o3/sparc/dyn_inst.hh:
src/cpu/o3/sparc/dyn_inst_impl.hh:
src/cpu/o3/sparc/impl.hh:
src/cpu/o3/sparc/params.hh:
src/cpu/o3/sparc/thread_context.cc:
src/cpu/o3/sparc/thread_context.hh:
    Sparc version of this file.

--HG--
extra : convert_revision : 34bb5218f802d0a1328132a518cdd769fb59b6a4

18 years agoMerge zower:/eecshome/m5/newmem
Gabe Black [Fri, 24 Nov 2006 19:08:44 +0000 (14:08 -0500)]
Merge zower:/eecshome/m5/newmem
into  ewok.(none):/home/gblack/m5/newmemo3

--HG--
extra : convert_revision : e8d6ce19a83fe526112c1dd61c48196eb8c0951f

18 years agoMerge zizzer:/bk/newmem
Gabe Black [Fri, 24 Nov 2006 19:08:43 +0000 (14:08 -0500)]
Merge zizzer:/bk/newmem
into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : 7dbd30ce5579dd62d5f54bb5d75cf12346bc5d1d

18 years agoRename this function.
Gabe Black [Fri, 24 Nov 2006 19:01:18 +0000 (14:01 -0500)]
Rename this function.

--HG--
extra : convert_revision : 57ea1e1d3b75e35abb3310d392ec70086fff699a

18 years agoFix weird type modifier.
Gabe Black [Fri, 24 Nov 2006 19:00:45 +0000 (14:00 -0500)]
Fix weird type modifier.

--HG--
extra : convert_revision : 7372b7a92b3c9d05388acb43ba58ada18464fa24

18 years agoFix an include problem.
Gabe Black [Fri, 24 Nov 2006 19:00:00 +0000 (14:00 -0500)]
Fix an include problem.

--HG--
extra : convert_revision : 89be55bd3f4f9b452a680a98b69ce42b80546769

18 years agoAdd no-op versions of ivlb and ivle back in for backwards compatibility.
Steve Reinhardt [Fri, 24 Nov 2006 17:32:33 +0000 (12:32 -0500)]
Add no-op versions of ivlb and ivle back in for backwards compatibility.

--HG--
extra : convert_revision : 383b72c130b20f3d7cde4e08fa36a481f3c0bf7c

18 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Steve Reinhardt [Thu, 23 Nov 2006 15:46:24 +0000 (10:46 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

--HG--
extra : convert_revision : 154bc605c62b1e51c32e65916d4c2eda3a3f22fd

18 years agoUse the right constant.
Gabe Black [Thu, 23 Nov 2006 06:27:41 +0000 (01:27 -0500)]
Use the right constant.

--HG--
extra : convert_revision : f93182ed41057025cc10df443b24e82fbe783df6

18 years agoFixes to the isa description.
Gabe Black [Thu, 23 Nov 2006 05:36:42 +0000 (00:36 -0500)]
Fixes to the isa description.

src/arch/sparc/isa/base.isa:
    Fix a constant.
src/arch/sparc/isa/decoder.isa:
    Made carry calculation more consistent.
src/arch/sparc/isa/operands.isa:
    Use the right constant.

--HG--
extra : convert_revision : 25b3a09ff20d4b8e1a95ee8a983d14ef3cfe73bb

18 years agoMoved some constants from isa_traits.hh to the reg file headers.
Gabe Black [Thu, 23 Nov 2006 04:49:44 +0000 (23:49 -0500)]
Moved some constants from isa_traits.hh to the reg file headers.

--HG--
extra : convert_revision : 378b2d9791e6282539900a2261ad2275d726b4be

18 years agoAdded a parameter to set memory to zero. This is to support Legion, and once we can...
Gabe Black [Thu, 23 Nov 2006 04:09:27 +0000 (23:09 -0500)]
Added a parameter to set memory to zero. This is to support Legion, and once we can make our own hypervisor binary, we probably won't need it.

--HG--
extra : convert_revision : 168883e4a5d3760962cd9759a6f41c66f5a6402a

18 years agoDo a functional access to levels above on a read as a temporary solution for L2's...
Ron Dreslinski [Thu, 23 Nov 2006 01:20:38 +0000 (20:20 -0500)]
Do a functional access to levels above on a read as a temporary solution for L2's in FS

Fix a small writeback bug when missing in the L2 in atomic mode

src/mem/bus.cc:
    Fix a comment to make sense
src/mem/cache/cache_impl.hh:
    Do a functional access to levels above on a read as a temporary solution for L2's in FS
    Also fix a small writeback miss in L2 issue
src/mem/cache/coherence/simple_coherence.hh:
src/mem/cache/coherence/uni_coherence.cc:
src/mem/cache/coherence/uni_coherence.hh:
    Do a functional access to levels above on a read as a temporary solution for L2's in FS
tests/quick/00.hello/ref/alpha/linux/o3-timing/m5stats.txt:
tests/quick/00.hello/ref/alpha/linux/simple-timing/m5stats.txt:
tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/m5stats.txt:
    Update ref's for writeback changes

--HG--
extra : convert_revision : 937febd577b16b7fd97a5a68acaf53541828a251

18 years agoMerge zizzer:/bk/sparcfs
Gabe Black [Wed, 22 Nov 2006 20:45:32 +0000 (15:45 -0500)]
Merge zizzer:/bk/sparcfs
into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : 75f3398e38e18eb1f8248e23708d7a8d8cce0fc5

18 years agoFix an assert to correctly make sure a request falls entirely inside a memory.
Gabe Black [Mon, 20 Nov 2006 23:11:19 +0000 (18:11 -0500)]
Fix an assert to correctly make sure a request falls entirely inside a memory.

--HG--
extra : convert_revision : 71cf02edffbc7029666c0d9c97b67e1d32332758

18 years agoAdd in checks of more Legion based state, and put in more sophisticated formatting...
Gabe Black [Mon, 20 Nov 2006 23:09:55 +0000 (18:09 -0500)]
Add in checks of more Legion based state, and put in more sophisticated formatting functions.

--HG--
extra : convert_revision : e3aa5919a6480aa01924c832a86fa1e8ddf5ba0d

18 years agoMake sure only real bits of pstate can be set.
Gabe Black [Mon, 20 Nov 2006 23:08:50 +0000 (18:08 -0500)]
Make sure only real bits of pstate can be set.

--HG--
extra : convert_revision : 8707bbed2aeb80613f86503e92b63853767adaa9

18 years agoSet the pstate.priv bit to 1 in hyperpriveleged mode. The description in the manual...
Gabe Black [Mon, 20 Nov 2006 23:07:58 +0000 (18:07 -0500)]
Set the pstate.priv bit to 1 in hyperpriveleged mode. The description in the manual of what happens during a trap says it should be 0, and other places say it doesn't matter.

--HG--
extra : convert_revision : 9ecb6af06657e936a208cbeb8e4a18305869b949

18 years agoAdd in rom/rams for the nvram, hypervisor description, and partition description.
Gabe Black [Mon, 20 Nov 2006 22:59:35 +0000 (17:59 -0500)]
Add in rom/rams for the nvram, hypervisor description, and partition description.

--HG--
extra : convert_revision : a49de5fcfbea307c971964b8a68b95eb5d9a2bf4

18 years agoFix typo.
Kevin Lim [Mon, 20 Nov 2006 16:44:27 +0000 (11:44 -0500)]
Fix typo.

--HG--
extra : convert_revision : 2dd830c6b3b5df894608b7596250b0181a3dfdf0

18 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Steve Reinhardt [Sun, 19 Nov 2006 23:38:12 +0000 (18:38 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

--HG--
extra : convert_revision : c2b7784377d85df5b8ee39c891cd3da9907410d8

18 years agoUpdate Virtual and Physical ports.
Kevin Lim [Sun, 19 Nov 2006 22:43:03 +0000 (17:43 -0500)]
Update Virtual and Physical ports.

src/cpu/o3/alpha/cpu_impl.hh:
    Handle the PhysicalPort and VirtualPort in the ThreadState.
src/cpu/o3/cpu.cc:
    Initialize the thread context.
src/cpu/o3/thread_context.hh:
    Add new function to initialize thread context.
src/cpu/o3/thread_context_impl.hh:
    Use code now put into function.
src/cpu/simple_thread.cc:
    Move code to ThreadState and use the new helper function.
src/cpu/simple_thread.hh:
    Remove init() in this derived class; use init() from ThreadState base class.
src/cpu/thread_state.cc:
    Move setting up of Physical and Virtual ports here.  Change getMemFuncPort() to connectToMemFunc(), which connects a port to a functional port of the memory object below the CPU.
src/cpu/thread_state.hh:
    Update functions.

--HG--
extra : convert_revision : ff254715ef0b259dc80d08f13543b63e4024ca8d

18 years agoMerge zizzer:/bk/newmem
Ron Dreslinski [Sat, 18 Nov 2006 03:01:18 +0000 (22:01 -0500)]
Merge zizzer:/bk/newmem
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

--HG--
extra : convert_revision : 1fc55d7d5707bb7c63790aab306ca5ea8ade5fab

18 years agoMake an initialization pass for the thread context and set the [phys,virt]Port correctly
Ron Dreslinski [Sat, 18 Nov 2006 02:55:28 +0000 (21:55 -0500)]
Make an initialization pass for the thread context and set the [phys,virt]Port correctly

src/cpu/simple/atomic.cc:
src/cpu/simple/timing.cc:
    Call the thread context initialization

--HG--
extra : convert_revision : d7dc2a8b893dc670077b7f6150d4b710a1778620

18 years agoadd warn_once which will print any given warning message
Nathan Binkert [Thu, 16 Nov 2006 21:18:21 +0000 (13:18 -0800)]
add warn_once which will print any given warning message
only once.

--HG--
extra : convert_revision : b64bb495c1bd0c4beb3db6ca28fad5af4d05ef8e

18 years agoImplement a single config file to encompass all of the SPEC
Nathan Binkert [Thu, 16 Nov 2006 21:10:38 +0000 (13:10 -0800)]
Implement a single config file to encompass all of the SPEC
CPU2000 stuff, and use it in all of the tests that currently
use SPEC

--HG--
extra : convert_revision : 8cd26a597e51a90b6d2810d344a075f5aa0f011b

18 years agoimplement RUSAGE_CHILDREN for getrusage since it's trivial
Nathan Binkert [Thu, 16 Nov 2006 21:08:29 +0000 (13:08 -0800)]
implement RUSAGE_CHILDREN for getrusage since it's trivial

--HG--
extra : convert_revision : bc12b3b2e9ee02f42c437cbc20680ea00e19a801

18 years agoImplement current working directory for LiveProcesses
Nathan Binkert [Thu, 16 Nov 2006 20:43:11 +0000 (12:43 -0800)]
Implement current working directory for LiveProcesses

--HG--
extra : convert_revision : a2d3cf29ab65c61af27d82a8c421a41a19fd5aeb

18 years agoMerge zower.eecs.umich.edu:/home/gblack/m5/newmemmemops
Gabe Black [Thu, 16 Nov 2006 19:42:44 +0000 (14:42 -0500)]
Merge zower.eecs.umich.edu:/home/gblack/m5/newmemmemops
into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : 74b2352b8f088e38cd1ecf3a8233b45df0476d93

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem/
Gabe Black [Thu, 16 Nov 2006 19:41:56 +0000 (14:41 -0500)]
Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zower.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : c49b760eac758dbde30867cb638fcb3b790f4721

18 years agoFixes for SPARC_FS
Gabe Black [Thu, 16 Nov 2006 17:34:10 +0000 (12:34 -0500)]
Fixes for SPARC_FS

configs/common/FSConfig.py:
    Make a SPARC system create an IO bus.
src/python/m5/objects/T1000.py:
    Create a T1000 platform
src/arch/sparc/miscregfile.cc:
    Initialize the strand status register to the value legion provides.
src/cpu/exetrace.cc:
    Truncate an ExtMachInst to a MachInst before comparing with Legion.

--HG--
extra : convert_revision : e4189b572a5297e8362f5bd26d87b74736c8e5f1

18 years agoAdd L2 cache option to fs.py --l2cache
Ron Dreslinski [Wed, 15 Nov 2006 23:22:15 +0000 (18:22 -0500)]
Add L2 cache option to fs.py --l2cache

--HG--
extra : convert_revision : 5bdd1129c3b23e91d441e7b83f6a824ef7740fab

18 years agoMerge zizzer:/bk/newmem
Ron Dreslinski [Tue, 14 Nov 2006 23:41:37 +0000 (18:41 -0500)]
Merge zizzer:/bk/newmem
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

--HG--
extra : convert_revision : 8d61b474428d494b1a5382e4cf95934ad54e35dd

18 years agoVarious fixes to delete packet and request a little better.
Kevin Lim [Tue, 14 Nov 2006 22:22:32 +0000 (17:22 -0500)]
Various fixes to delete packet and request a little better.

src/cpu/simple/timing.cc:
    Various updates for deleting requests more properly.

    The major change is moving the deletion of the fetch request/packet to after the instruction has executed and completed.  This should fix a few bugs because Ron's memory system didn't expect a call for a functional access while a timing access was being processed.

--HG--
extra : convert_revision : c7cf114bb1ff3cdaa7b0a40ed4c5302dc9d3a522

18 years agoMerge zizzer:/bk/newmem
Ron Dreslinski [Tue, 14 Nov 2006 22:19:57 +0000 (17:19 -0500)]
Merge zizzer:/bk/newmem
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

--HG--
extra : convert_revision : b216fcdb2632dce68ac18932b0c13408eb1aeaf4

18 years agoFix bugs around uni-coherence invalidates being propogated properly.
Ron Dreslinski [Tue, 14 Nov 2006 22:15:05 +0000 (17:15 -0500)]
Fix bugs around uni-coherence invalidates being propogated properly.

src/mem/bus.cc:
    Make it so that invalidates being sent from the responder up don't call the responder
    but they should also not Panic.
src/mem/packet.hh:
    If we don't have data in the packet, don't call deleteData:
    Example: InvalidateRequests never have data.

--HG--
extra : convert_revision : 18766bc9f3bb4d852ac651d094254d347abd1634

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem/
Gabe Black [Tue, 14 Nov 2006 20:23:23 +0000 (15:23 -0500)]
Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : 966246877ac1f1e6c2675d413b0b405cccfecbeb

18 years agoMerge 141.212.106.238:/home/gblack/m5/newmemmemops
Gabe Black [Tue, 14 Nov 2006 20:14:28 +0000 (15:14 -0500)]
Merge 141.212.106.238:/home/gblack/m5/newmemmemops
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem

--HG--
extra : convert_revision : 8e805b9bbd5c64c2e5951384b3c6ef712062d08c

18 years agoCreate a stub t1000 platform.
Gabe Black [Tue, 14 Nov 2006 20:14:27 +0000 (15:14 -0500)]
Create a stub t1000 platform.

--HG--
extra : convert_revision : 7e27b23b66c743b4625a1dd9d8d6ba61bff45168

18 years agoMerge zizzer:/bk/newmem
Lisa Hsu [Tue, 14 Nov 2006 18:00:05 +0000 (13:00 -0500)]
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/sparc/m5

--HG--
extra : convert_revision : 6abd919711966eaaa157483557a3f953b02dde01

18 years agointerrupts.hh:
Lisa Hsu [Tue, 14 Nov 2006 17:59:57 +0000 (12:59 -0500)]
interrupts.hh:
make a likewise updateIntrInfo for Sparc that's blank so it doesn't fart on build

src/arch/sparc/interrupts.hh:
    make a likewise updateIntrInfo for Sparc that's blank so it doesn't fart on build

--HG--
extra : convert_revision : 5f469d0cf897479b42703104cd801a8ef923fcae

18 years agoIf all the targets aren't satisfied, reinitialize the packet.
Ron Dreslinski [Tue, 14 Nov 2006 15:09:13 +0000 (10:09 -0500)]
If all the targets aren't satisfied, reinitialize the packet.

--HG--
extra : convert_revision : 5b0a977a162a1b881b97a3185fb386cc76632a4a

18 years agoUpdate atomic and functional paths for snoops as well
Ron Dreslinski [Tue, 14 Nov 2006 06:38:42 +0000 (01:38 -0500)]
Update atomic and functional paths for snoops as well

--HG--
extra : convert_revision : 566d73438efb87ca683e4dee23454d880db3dfc7

18 years agoMerge 141.212.106.238:/home/gblack/m5/newmemmemops
Gabe Black [Tue, 14 Nov 2006 06:31:37 +0000 (01:31 -0500)]
Merge 141.212.106.238:/home/gblack/m5/newmemmemops
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem

--HG--
extra : convert_revision : cda58e6e63f2f909b85a510fb76d35d49d8042b9

18 years agoSet hpstate to be what I'm assuming Legion is.
Gabe Black [Tue, 14 Nov 2006 06:30:34 +0000 (01:30 -0500)]
Set hpstate to be what I'm assuming Legion is.

--HG--
extra : convert_revision : 0be66513cb0cff07c0c2b50c97c1ea74d52b0dc9

18 years agoMake sure a POR doesn't clobber the value of the hpstate.
Gabe Black [Tue, 14 Nov 2006 06:29:11 +0000 (01:29 -0500)]
Make sure a POR doesn't clobber the value of the hpstate.

--HG--
extra : convert_revision : 4504f08fd94792819bd4419bbd2e0ebd1d7f29e9

18 years agoFix up the disassembly a little.
Gabe Black [Tue, 14 Nov 2006 06:28:11 +0000 (01:28 -0500)]
Fix up the disassembly a little.

--HG--
extra : convert_revision : 7bdf68f445b79b1b5dbcdfa5fa1005c68d03724c

18 years agoMerge 141.212.106.238:/home/gblack/m5/newmemmemops
Gabe Black [Tue, 14 Nov 2006 06:23:59 +0000 (01:23 -0500)]
Merge 141.212.106.238:/home/gblack/m5/newmemmemops
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem

--HG--
extra : convert_revision : 753831a9f6f79d07e6ee122ab894e24161d2e722

18 years agoUpdate phase param in the .py file for the cpus
Ron Dreslinski [Tue, 14 Nov 2006 06:13:26 +0000 (01:13 -0500)]
Update phase param in the .py file for the cpus

--HG--
extra : convert_revision : cd2eb8c00adcb34b8693a4d1a66187927c0f6803

18 years agoUpdate bus bridges now that snoop ranges are passed properly
Ron Dreslinski [Tue, 14 Nov 2006 06:12:52 +0000 (01:12 -0500)]
Update bus bridges now that snoop ranges are passed properly

src/mem/bridge.cc:
    Update brdiges, now that snoop addresses are properly forwarded.
    Bus bridge should only handle snoops on the second phase (SNOOP_COMMIT)
src/mem/bus.cc:
src/mem/bus.hh:
    Make sure if a busBridge has access to both things that snoop and things that respond it only takes the request once

--HG--
extra : convert_revision : 26cc9ee4429be45d4476fa435e0e9a54843c2509

18 years agoMake cpu's capable of having a phase shift
Ron Dreslinski [Tue, 14 Nov 2006 06:10:36 +0000 (01:10 -0500)]
Make cpu's capable of having a phase shift

--HG--
extra : convert_revision : 7f082ba5c1cd2445aec731950c31a877aac23a75

18 years agoFix a bug to handle the fact that a CPU can send Functional accesses while a sendTimi...
Ron Dreslinski [Tue, 14 Nov 2006 03:37:22 +0000 (22:37 -0500)]
Fix a bug to handle the fact that a CPU can send Functional accesses while a sendTiming has not returned in the call stack.

src/mem/cache/base_cache.cc:
    Sometimes a functional access comes while waiting on a outstanding packet being sent.
    This could be because Timing CPU does some post processing on the recvTiming which send functional access.
    Either the CPU should leave the pkt/req around (so They can be referenced in the mem system). Or the mem
    system should remove them from outstanding lists and reinsert them if they fail in the sendTiming.

    I did the later, eventually we should consider doing the former if that is the correct behavior.

--HG--
extra : convert_revision : be41e0d2632369dca9d7c15e96e5576d7583fe6a

18 years agoMerge zizzer:/bk/newmem
Ron Dreslinski [Tue, 14 Nov 2006 02:59:50 +0000 (21:59 -0500)]
Merge zizzer:/bk/newmem
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

--HG--
extra : convert_revision : 253766a17bb5e109f8ad76b3c54e443db5274ef5

18 years agoIf we didn't satisfy all targets, reset the packet we are requesting with.
Ron Dreslinski [Tue, 14 Nov 2006 02:34:25 +0000 (21:34 -0500)]
If we didn't satisfy all targets, reset the packet we are requesting with.

--HG--
extra : convert_revision : 736372131b046eccf3520292fb3c086dc568d918

18 years agoFix some errors related to snooping and functional access in the bus
Ron Dreslinski [Tue, 14 Nov 2006 02:33:01 +0000 (21:33 -0500)]
Fix some errors related to snooping and functional access in the bus

src/mem/bus.cc:
    Only call snoop once per port, need to fix it so snoop ranges that overlap aren't added to list
    Functional accesses that call snoop and it goes to a higher bus may change the src, reset it after each snoop.

--HG--
extra : convert_revision : 7276059c798a85cb9d138ccc5531298ecd055c13

18 years agoFix problems with snoop ranges not working properly on functional accesses
Ron Dreslinski [Tue, 14 Nov 2006 00:56:34 +0000 (19:56 -0500)]
Fix problems with snoop ranges not working properly on functional accesses

src/mem/bus.cc:
    Actually return the snoop list when asked for it.
    Don't get stuck in infinite functional loops

--HG--
extra : convert_revision : 8e6dafbd10b30d48d28b6b5d4b464e8e8f6a3ddc

18 years agoChanges needed for a bus from CPU->L1
Ron Dreslinski [Tue, 14 Nov 2006 00:12:45 +0000 (19:12 -0500)]
Changes needed for a bus from CPU->L1

src/cpu/simple/atomic.cc:
    Make the atomic cpu return 0 on snoops.

--HG--
extra : convert_revision : aad96ad36e0c764c7cfef8b0c8e97877574f5845

18 years agoSince cpus now send out snoop ranges, remove it from the cache.
Ron Dreslinski [Tue, 14 Nov 2006 00:00:50 +0000 (19:00 -0500)]
Since cpus now send out snoop ranges, remove it from the cache.

--HG--
extra : convert_revision : 82882eb131aa66eba9f281b64db21d5cbfefb1b9

18 years agoMake CPU models signal to update the snoop ranges
Ron Dreslinski [Mon, 13 Nov 2006 23:51:16 +0000 (18:51 -0500)]
Make CPU models signal to update the snoop ranges

--HG--
extra : convert_revision : 717b62510f28a69af99453309fbbb458359eeb2a

18 years agomain.i:
Lisa Hsu [Mon, 13 Nov 2006 21:18:47 +0000 (16:18 -0500)]
main.i:
swig still thought the default arg for simulate() was -1, make it MaxTick

--HG--
extra : convert_revision : 2bcbef7e5e5d28cf55645fdc53d43e3953b1a11c

18 years agoUpdate splash2 config files
Ron Dreslinski [Mon, 13 Nov 2006 21:09:47 +0000 (16:09 -0500)]
Update splash2 config files

configs/splash2/run.py:
    Fix MaxTick for splash configs
configs/splash2/cluster.py:
    Add a config that allows clusters of CPU's to be attached to a single L1

--HG--
extra : convert_revision : 1bb0a0c5f4889316940a9858be90ae2eaa849f1a

18 years agoExpose debugBreakCycle through swig and get rid of
Nathan Binkert [Mon, 13 Nov 2006 20:20:08 +0000 (12:20 -0800)]
Expose debugBreakCycle through swig and get rid of
the Debug param context

--HG--
extra : convert_revision : 40e9dcfa9faedbe0c90a43f908f20a7c14ded6a4

18 years agoClean up comment
Nathan Binkert [Mon, 13 Nov 2006 20:18:36 +0000 (12:18 -0800)]
Clean up comment

--HG--
extra : convert_revision : 75c6415c49305e2f8cf7f833c66a46a4dee503ea

18 years agoParse CC/CXX early so that we use the correct compiler for testing dependencies/versi...
Ali Saidi [Mon, 13 Nov 2006 18:26:36 +0000 (13:26 -0500)]
Parse CC/CXX early so that we use the correct compiler for testing dependencies/versions/libraries/etc

--HG--
extra : convert_revision : b34ee03e44b35df30b746c4c570316db75d6ffe5

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Mon, 13 Nov 2006 07:49:13 +0000 (02:49 -0500)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : 6ef2249bfa3f7149830efdb42a313422090da7d7

18 years agoMore interrupt reworking.
Kevin Lim [Mon, 13 Nov 2006 07:49:03 +0000 (02:49 -0500)]
More interrupt reworking.

--HG--
extra : convert_revision : 40dfbb72c4e418c54e909c54dad5fe6ef7017cb4

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Steve Reinhardt [Mon, 13 Nov 2006 06:04:00 +0000 (22:04 -0800)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  vm1.(none):/home/stever/bk/newmem-head

--HG--
extra : convert_revision : faab7569deefde94c20133b2f70a8567bcaa2960

18 years agoMake setRegWithEffect do something in SE mode.
Steve Reinhardt [Mon, 13 Nov 2006 06:03:42 +0000 (22:03 -0800)]
Make setRegWithEffect do something in SE mode.

--HG--
extra : convert_revision : 88fdaa403fe6d083f8c8fc064cb0d0d6a8b8daf8

18 years agoChange warn to DPRINTF.
Kevin Lim [Mon, 13 Nov 2006 05:26:38 +0000 (00:26 -0500)]
Change warn to DPRINTF.

--HG--
extra : convert_revision : 746bdf92334d220158eb0eb6bf113b4dcedbb354

18 years agoUpdate output refs. Some FS statistics will change (namely the ITB) due to the recen...
Kevin Lim [Mon, 13 Nov 2006 05:24:22 +0000 (00:24 -0500)]
Update output refs.  Some FS statistics will change (namely the ITB) due to the recent TLB changes.  Now PAL mode accesses are counted as hits in the TLB.

tests/quick/00.hello/ref/alpha/linux/o3-timing/config.ini:
tests/quick/00.hello/ref/alpha/linux/o3-timing/config.out:
tests/quick/00.hello/ref/alpha/linux/o3-timing/stderr:
tests/quick/00.hello/ref/alpha/linux/o3-timing/stdout:
tests/quick/00.hello/ref/alpha/linux/simple-atomic/config.ini:
tests/quick/00.hello/ref/alpha/linux/simple-atomic/config.out:
tests/quick/00.hello/ref/alpha/linux/simple-timing/config.ini:
tests/quick/00.hello/ref/alpha/linux/simple-timing/config.out:
tests/quick/00.hello/ref/alpha/tru64/o3-timing/config.ini:
tests/quick/00.hello/ref/alpha/tru64/o3-timing/config.out:
tests/quick/00.hello/ref/alpha/tru64/o3-timing/stderr:
tests/quick/00.hello/ref/alpha/tru64/o3-timing/stdout:
tests/quick/00.hello/ref/alpha/tru64/simple-atomic/config.ini:
tests/quick/00.hello/ref/alpha/tru64/simple-atomic/config.out:
tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.ini:
tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.out:
tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini:
tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.out:
tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/m5stats.txt:
tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/stderr:
tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/stdout:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/m5stats.txt:
tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini:
tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out:
    Update refs.

--HG--
extra : convert_revision : 6798c5753d4d7bd7b5667d59cf564012b781ce8a

18 years agoFix typo.
Kevin Lim [Mon, 13 Nov 2006 04:31:29 +0000 (23:31 -0500)]
Fix typo.

--HG--
extra : convert_revision : 05db10e20d33302fe830d5759b8881b1233aca87

18 years agoFix for regression failure.
Kevin Lim [Mon, 13 Nov 2006 04:30:09 +0000 (23:30 -0500)]
Fix for regression failure.

src/cpu/o3/fetch_impl.hh:
    Fetch needs to make sure it isn't waiting on an Icache access.

--HG--
extra : convert_revision : b53eb58b9e5a00bdb394134586d1f84f84d1c6e1

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem/
Gabe Black [Mon, 13 Nov 2006 03:36:22 +0000 (22:36 -0500)]
Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : eed3b6a650635d43fe75c2158c8417647af640d9

18 years agoMerge ktlim@zamp:./local/clean/tmp/test-regress
Kevin Lim [Mon, 13 Nov 2006 02:57:58 +0000 (21:57 -0500)]
Merge ktlim@zamp:./local/clean/tmp/test-regress
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : b98236507bb8996ce605b48b5a5a6a7aac297dc5

18 years agoFix for non-FS compile.
Kevin Lim [Mon, 13 Nov 2006 02:49:51 +0000 (21:49 -0500)]
Fix for non-FS compile.

--HG--
extra : convert_revision : 661b412b0ae670181b89cb7dbc5e9d813804aa7a

18 years agoCreate a module called internal where swigged stuff goes.
Nathan Binkert [Mon, 13 Nov 2006 02:49:16 +0000 (18:49 -0800)]
Create a module called internal where swigged stuff goes.
Rename cc_main to internal.main

--HG--
extra : convert_revision : e938005f600fbf8a43435e29426a948f4501f072

18 years agoUpdates to support new interrupt processing and removal of PcPAL.
Kevin Lim [Mon, 13 Nov 2006 01:15:30 +0000 (20:15 -0500)]
Updates to support new interrupt processing and removal of PcPAL.

src/arch/alpha/interrupts.hh:
    No need for this now that the ThreadContext is being used to set these IPRs in interrupts.
    Also split up the interrupt checking from the updating of the IPL and interrupt summary.
src/arch/alpha/tlb.cc:
    Check the PC for whether or not it's in PAL mode, not the addr.
src/cpu/o3/alpha/cpu.hh:
    Split up getting the interrupt from actually processing the interrupt.
src/cpu/o3/alpha/cpu_impl.hh:
    Splut up the processing of interrupts.
src/cpu/o3/commit_impl.hh:
    Update for ISA-oriented interrupt changes.
src/cpu/o3/fetch_impl.hh:
    Fix broken if statement from PcPAL updates, and properly populate the request fields.

    Also more debugging output.
src/cpu/ozone/cpu_impl.hh:
    Updates for ISA-oriented interrupt stuff.
src/cpu/ozone/front_end_impl.hh:
    Populate request fields properly.
src/cpu/simple/base.cc:
    Update for interrupt stuff.

--HG--
extra : convert_revision : 9bac3f9ffed4948ee788699b2fa8419bc1ca647c

18 years agoUpdate for maxtick in splash2/memtest configs
Ron Dreslinski [Sun, 12 Nov 2006 16:42:07 +0000 (11:42 -0500)]
Update for maxtick in splash2/memtest configs

configs/example/memtest.py:
configs/splash2/run.py:
    Update for maxtick

--HG--
extra : convert_revision : 94106625be1ebc2b614db16720a4861e47222c0b

18 years agoUpdate refs for functional access fixes
Ron Dreslinski [Sun, 12 Nov 2006 16:07:34 +0000 (11:07 -0500)]
Update refs for functional access fixes

--HG--
extra : convert_revision : aa34e0e7254daf20ecb7c14d430f08927a8fb9ca

18 years agoMerge zizzer:/bk/newmem
Ron Dreslinski [Sun, 12 Nov 2006 15:41:18 +0000 (10:41 -0500)]
Merge zizzer:/bk/newmem
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

--HG--
extra : convert_revision : 498304c24435437f8f1942bb8aeafe69ba22a089

18 years agoPhysical memory overrides the tport version of recvFunctional, need to do the
Ron Dreslinski [Sun, 12 Nov 2006 14:30:12 +0000 (09:30 -0500)]
Physical memory overrides the tport version of recvFunctional, need to do the
check here for responses that match as well

--HG--
extra : convert_revision : 69c3628a381a9da885fab0272abf40c3411a5f0f

18 years agoHandle packets being deleted by lower level properly.
Ron Dreslinski [Sun, 12 Nov 2006 14:06:15 +0000 (09:06 -0500)]
Handle packets being deleted by lower level properly.
Fixes for Mem Leak associated with Writebacks.

src/mem/cache/miss/mshr_queue.cc:
    Fixes for Mem Leak associated with Writebacks. (Double Delete removed)

--HG--
extra : convert_revision : 7a52ddd57da35995896f2c4438a58aa53f762416

18 years agoDon't insert reponses into the list more than once
Ron Dreslinski [Sun, 12 Nov 2006 12:16:34 +0000 (07:16 -0500)]
Don't insert reponses into the list more than once
If you get inserted in the front, reschedule the event

--HG--
extra : convert_revision : eccbacf5ec85600e5b68eb554fee2c0e2b65e965

18 years agoMove code before a early return to make sure it is executed on all paths
Ron Dreslinski [Sun, 12 Nov 2006 11:44:05 +0000 (06:44 -0500)]
Move code before a early return to make sure it is executed on all paths

--HG--
extra : convert_revision : cfdd5b6911422fbb733677c43d027aa4407fbc85

18 years agoYet another small bug in mem system related to flow control
Ron Dreslinski [Sun, 12 Nov 2006 11:36:33 +0000 (06:36 -0500)]
Yet another small bug in mem system related to flow control

src/mem/cache/cache_impl.hh:
    When upgrades change to readEx make sure to allocate the block
    Fix dprintf

--HG--
extra : convert_revision : 8700a7e47ad042c8708302620b907849c4bfdded

18 years agoFix functional access errors related to delayed respnoses in cachePort
Ron Dreslinski [Sun, 12 Nov 2006 11:35:39 +0000 (06:35 -0500)]
Fix functional access errors related to delayed respnoses in cachePort

src/mem/cache/base_cache.cc:
    On a delayed response, be sure to call the fixPacket wrapper to toggle hasData flag.
src/mem/packet.cc:
src/mem/packet.hh:
    Create a wrapper to toggle the hasData flag on delayed responses

--HG--
extra : convert_revision : 1ced8d4e3dc12a059fb7636d59e429cd3dd46901

18 years agoFix Typo
Nathan Binkert [Sun, 12 Nov 2006 07:57:20 +0000 (23:57 -0800)]
Fix Typo

--HG--
extra : convert_revision : 4f5b610f364876b29ad0e04f1757e4b42d1f2bd8