gem5.git
18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Thu, 2 Nov 2006 20:20:47 +0000 (15:20 -0500)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : a9a41e2c292bd95aa148e1cf4d9a77c0622a462b

18 years agoHave bus use the BadAddress device to handle bad addresses. The O3 CPU should be...
Kevin Lim [Thu, 2 Nov 2006 20:20:37 +0000 (15:20 -0500)]
Have bus use the BadAddress device to handle bad addresses.  The O3 CPU should be able to boot into Linux with caches on after this change.

src/mem/bus.cc:
src/mem/bus.hh:
    Bus now will be setup with a default responder, unless the user overrides it.  This default responder should return BadAddress if no matching port is found.
src/python/m5/objects/Bus.py:
    Bus now has a default responder for FS mode if the user doesn't override it.  It returns BadAddress if no matching port is found.
src/python/m5/objects/Tsunami.py:
    Add bad address device.  Also record when the user has specified their own default responder.

--HG--
extra : convert_revision : 59070477ae313ee711b2d59baa2369c9a91c5b85

18 years agoImplement device that will return BadAddress.
Kevin Lim [Thu, 2 Nov 2006 20:18:35 +0000 (15:18 -0500)]
Implement device that will return BadAddress.

--HG--
extra : convert_revision : d833c20f691e01c84a0678f19f7d83f3ee50c0c1

18 years agoCaches return a new functional port whenever asked for one.
Kevin Lim [Thu, 2 Nov 2006 20:17:45 +0000 (15:17 -0500)]
Caches return a new functional port whenever asked for one.

src/mem/cache/base_cache.cc:
    Have caches return a new functional port whenever asked for them.  I'm pretty sure this is desired behavior.  Ron can correct me if it's not.

--HG--
extra : convert_revision : e1fadf895a7d714968128ff900d10e86fde53387

18 years agoMore proper handling of the ports.
Kevin Lim [Thu, 2 Nov 2006 19:58:31 +0000 (14:58 -0500)]
More proper handling of the ports.

src/cpu/simple_thread.cc:
    Fix up port handling to share code.
src/cpu/thread_state.cc:
    Separate code off into a function.
src/cpu/thread_state.hh:
    Make a separate function that will get the CPU's memory's functional port.

--HG--
extra : convert_revision : 96a9bb3c5e4b9ba5511678c0fd17f0017c8cd312

18 years agoRemove function that should have been deleted.
Kevin Lim [Thu, 2 Nov 2006 18:12:36 +0000 (13:12 -0500)]
Remove function that should have been deleted.

src/cpu/simple_thread.cc:
    This function should have been deleted from an earlier push.
src/cpu/simple_thread.hh:
    Delete this function; it's now in thread_state.hh/.cc.

--HG--
extra : convert_revision : f78dcf9c2b388418030d48d0ea4911c8b8b1f5ff

18 years agoUse ISA specific makeExtMI.
Kevin Lim [Thu, 2 Nov 2006 18:11:38 +0000 (13:11 -0500)]
Use ISA specific makeExtMI.

src/arch/alpha/utility.hh:
    For now makeExtMI will be specific to the ISA.

--HG--
extra : convert_revision : 89959c6499efcc3df9301ad8ea039580764a1496

18 years agoMerge zizzer:/bk/newmem
Lisa Hsu [Thu, 2 Nov 2006 00:25:20 +0000 (19:25 -0500)]
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : a30e2da1f0a272b8c867c0e7a3491118be92bc5e

18 years agofactor some more commone code and enable going from checkpoint into arbitrary CPU...
Lisa Hsu [Thu, 2 Nov 2006 00:25:09 +0000 (19:25 -0500)]
factor some more commone code and enable going from checkpoint into arbitrary CPU with or without caches.

configs/common/Simulation.py:
    enable going from checkpoint into arbitrary CPU with or without caches.

--HG--
extra : convert_revision : 02e7ff8982fdb3a08bc609f89bd58df5b3a581b2

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem/
Gabe Black [Thu, 2 Nov 2006 00:00:59 +0000 (19:00 -0500)]
Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : c2f7398a0d14dd11108579bb243ada7420285a22

18 years agoAdded code to handle draining.
Gabe Black [Thu, 2 Nov 2006 00:00:49 +0000 (19:00 -0500)]
Added code to handle draining.

--HG--
extra : convert_revision : 3861f553bde5865cd21a8a58a4c410896726f0a3

18 years agoFix a range check on the ipr_index.
Gabe Black [Wed, 1 Nov 2006 23:46:18 +0000 (18:46 -0500)]
Fix a range check on the ipr_index.

--HG--
extra : convert_revision : 84e25abd4bb2de0c877c883804d39feb019c7030

18 years agoAdjustments for the AlphaTLB changing to AlphaISA::TLB and changing register file...
Gabe Black [Wed, 1 Nov 2006 21:44:45 +0000 (16:44 -0500)]
Adjustments for the AlphaTLB changing to AlphaISA::TLB and changing register file functions to not take faults

--HG--
extra : convert_revision : 1cef0734462ee2e4db12482462c2ab3c134d3675

18 years agomake it so that you can do a standard switch without the caches option. this will...
Lisa Hsu [Wed, 1 Nov 2006 16:49:39 +0000 (11:49 -0500)]
make it so that you can do a standard switch without the caches option.  this will have only the o3 cpu have a cache, rather than timing (warmup) + o3 have cache.

--HG--
extra : convert_revision : d733de7ebb362bbd7376a0235ee7f117df2d6d37

18 years agochange name of 2nd switch_cpu so that ckpt recovery with multiple cpus doens't get...
Lisa Hsu [Wed, 1 Nov 2006 16:40:49 +0000 (11:40 -0500)]
change name of 2nd switch_cpu so that ckpt recovery with multiple cpus doens't get confused.

--HG--
extra : convert_revision : 16c710c4196c520d03c1993a26f38cf1f04ab637

18 years agoArg!
Gabe Black [Tue, 31 Oct 2006 23:59:50 +0000 (18:59 -0500)]
Arg!

--HG--
extra : convert_revision : 8328d002780c0291e7eb264076a62084de88b7a5

18 years agoMore typos! I need to get nfs to work.
Gabe Black [Tue, 31 Oct 2006 23:51:26 +0000 (18:51 -0500)]
More typos! I need to get nfs to work.

--HG--
extra : convert_revision : f5693e96d376254f777fb0cce7b5be3d36efbea9

18 years agoFix another typo
Gabe Black [Tue, 31 Oct 2006 23:39:17 +0000 (18:39 -0500)]
Fix another typo

--HG--
extra : convert_revision : ad7058babf2a13bfe543e05f2662dc49a18a8b8b

18 years agoCheck for out of range IPR values as well.
Gabe Black [Tue, 31 Oct 2006 23:19:45 +0000 (18:19 -0500)]
Check for out of range IPR values as well.

--HG--
extra : convert_revision : 9ca241bb71d8a1d022e54485383a88d2abece663

18 years agoFix stupid typo
Gabe Black [Tue, 31 Oct 2006 23:01:31 +0000 (18:01 -0500)]
Fix stupid typo

--HG--
extra : convert_revision : fbfc82974e89b2c726b689674c9f5d957682b280

18 years agoMake two simple utility functions to determine if a MiscReg index corresponding to...
Gabe Black [Tue, 31 Oct 2006 22:50:57 +0000 (17:50 -0500)]
Make two simple utility functions to determine if a MiscReg index corresponding to an IPR is readable or writable.

--HG--
extra : convert_revision : 89eebba5eec01e629213997d24c734a6acad0ecb

18 years agoForgot to add intr_flag in one place.
Gabe Black [Tue, 31 Oct 2006 22:14:46 +0000 (17:14 -0500)]
Forgot to add intr_flag in one place.

--HG--
extra : convert_revision : 637256098e2283c18f98bdaabf21f3039d162a15

18 years agoWe don't include ipr.cc in SE builds, so don't call it.
Gabe Black [Tue, 31 Oct 2006 21:59:41 +0000 (16:59 -0500)]
We don't include ipr.cc in SE builds, so don't call it.

--HG--
extra : convert_revision : 45e52d7afbf74e0ddde11f58aeb084186389fc06

18 years agoMade the old name refer to the miscreg index to prevent having to change code all...
Gabe Black [Tue, 31 Oct 2006 21:36:45 +0000 (16:36 -0500)]
Made the old name refer to the miscreg index to prevent having to change code all over the place.

--HG--
extra : convert_revision : e890a3ce420336acdb220396dcbf66d4b9974c76

18 years agoForgot to change the index.
Gabe Black [Tue, 31 Oct 2006 21:18:54 +0000 (16:18 -0500)]
Forgot to change the index.

--HG--
extra : convert_revision : 5a444e635d20bcca445a10e43592b6c10d25e879

18 years agoMake the IPRs use regular miscreg indexes, and make a table or two to find the miscre...
Gabe Black [Tue, 31 Oct 2006 21:02:28 +0000 (16:02 -0500)]
Make the IPRs use regular miscreg indexes, and make a table or two to find the miscreg index of a specific IPR.

--HG--
extra : convert_revision : dd235261e7086d6667b1b2bdc4a81b2573e21d53

18 years agoFix up configs.
Kevin Lim [Tue, 31 Oct 2006 19:58:09 +0000 (14:58 -0500)]
Fix up configs.

configs/common/Simulation.py:
    Remove mem parameter.
configs/example/se.py:
    Remove debug output that got included in my other push.

--HG--
extra : convert_revision : 643c34147f6c6cbb98b8e6d6e8206b9859593ab0

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Tue, 31 Oct 2006 19:37:19 +0000 (14:37 -0500)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

configs/example/fs.py:
configs/example/se.py:
src/mem/tport.hh:
    Hand merge.

--HG--
extra : convert_revision : b9df95534d43b3b311f24ae24717371d03d615bf

18 years agoRemove mem parameter. Now the translating port asks the CPU's dcache's peer for...
Kevin Lim [Tue, 31 Oct 2006 19:33:56 +0000 (14:33 -0500)]
Remove mem parameter.  Now the translating port asks the CPU's dcache's peer for its MemObject instead of having to have a paramter for the MemObject.

configs/example/fs.py:
configs/example/se.py:
src/cpu/simple/base.cc:
src/cpu/simple/base.hh:
src/cpu/simple/timing.cc:
src/cpu/simple_thread.cc:
src/cpu/simple_thread.hh:
src/cpu/thread_state.cc:
src/cpu/thread_state.hh:
tests/configs/o3-timing-mp.py:
tests/configs/o3-timing.py:
tests/configs/simple-atomic-mp.py:
tests/configs/simple-atomic.py:
tests/configs/simple-timing-mp.py:
tests/configs/simple-timing.py:
tests/configs/tsunami-simple-atomic-dual.py:
tests/configs/tsunami-simple-atomic.py:
tests/configs/tsunami-simple-timing-dual.py:
tests/configs/tsunami-simple-timing.py:
    No need for mem parameter any more.
src/cpu/checker/cpu.cc:
    Use new constructor for simple thread (no more MemObject parameter).
src/cpu/checker/cpu.hh:
    Remove MemObject parameter.
src/cpu/memtest/memtest.hh:
    Ports now take in their MemObject owner.
src/cpu/o3/alpha/cpu_builder.cc:
    Remove mem parameter.
src/cpu/o3/alpha/cpu_impl.hh:
    Remove memory parameter and clean up handling of TranslatingPort.
src/cpu/o3/cpu.cc:
src/cpu/o3/cpu.hh:
src/cpu/o3/fetch.hh:
src/cpu/o3/fetch_impl.hh:
src/cpu/o3/mips/cpu_builder.cc:
src/cpu/o3/mips/cpu_impl.hh:
src/cpu/o3/params.hh:
src/cpu/o3/thread_state.hh:
src/cpu/ozone/cpu.hh:
src/cpu/ozone/cpu_builder.cc:
src/cpu/ozone/cpu_impl.hh:
src/cpu/ozone/front_end.hh:
src/cpu/ozone/front_end_impl.hh:
src/cpu/ozone/lw_lsq.hh:
src/cpu/ozone/lw_lsq_impl.hh:
src/cpu/ozone/simple_params.hh:
src/cpu/ozone/thread_state.hh:
src/cpu/simple/atomic.cc:
    Remove memory parameter.

--HG--
extra : convert_revision : 43cb44a33b31320d44b69679dcf646c0380d07d3

18 years agoPorts now have a pointer to the MemObject that owns it (can be NULL).
Kevin Lim [Tue, 31 Oct 2006 18:59:30 +0000 (13:59 -0500)]
Ports now have a pointer to the MemObject that owns it (can be NULL).

src/cpu/simple/atomic.hh:
    Port now takes in the MemObject that owns it.
src/cpu/simple/timing.hh:
    Port now takes in MemObject that owns it.
src/dev/io_device.cc:
src/mem/bus.hh:
    Ports now take in the MemObject that owns it.
src/mem/cache/base_cache.cc:
    Ports now take in the MemObject that own it.
src/mem/port.hh:
src/mem/tport.hh:
    Ports now optionally take in the MemObject that owns it.

--HG--
extra : convert_revision : 890a72a871795987c2236c65937e06973412d349

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Tue, 31 Oct 2006 18:24:00 +0000 (13:24 -0500)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem.head

--HG--
extra : convert_revision : 42712a50ca46ebc891b78186f4b6d1412a35d374

18 years agoremove connectAll() and connect() code since it isn't used anymore. (The python does...
Ali Saidi [Tue, 31 Oct 2006 18:23:49 +0000 (13:23 -0500)]
remove connectAll() and connect() code since it isn't used anymore. (The python does it all)

--HG--
extra : convert_revision : e16a1ff59d4522703b155c2e68379a3072e8f47f

18 years agoadd the ability to insert into the middle of the timing port send list
Ali Saidi [Tue, 31 Oct 2006 18:23:17 +0000 (13:23 -0500)]
add the ability to insert into the middle of the timing port send list

--HG--
extra : convert_revision : 5422025f74ba7013f98d1d1dcbd1070f580aae61

18 years agoMissed a few instances of this function.
Gabe Black [Tue, 31 Oct 2006 09:12:52 +0000 (04:12 -0500)]
Missed a few instances of this function.

--HG--
extra : convert_revision : 581f97dafc2b30bd5067f6ff7f9cdbabc6890622

18 years agoGet rid of old, commented out code.
Gabe Black [Tue, 31 Oct 2006 08:44:39 +0000 (03:44 -0500)]
Get rid of old, commented out code.

--HG--
extra : convert_revision : 46e9f26917efab642b80ea9e4303ec95d43d935e

18 years agoMove IntrFlag into the MiscRegFile and get rid of specialized accessor functions.
Gabe Black [Tue, 31 Oct 2006 08:37:01 +0000 (03:37 -0500)]
Move IntrFlag into the MiscRegFile and get rid of specialized accessor functions.

--HG--
extra : convert_revision : e0d12a150b01d05de9bc02bcbc7c22797975a5b9

18 years agoPut the Alpha tlb stuff into the AlphaISA namespace, and give the classes more neutra...
Gabe Black [Tue, 31 Oct 2006 07:08:44 +0000 (02:08 -0500)]
Put the Alpha tlb stuff into the AlphaISA namespace, and give the classes more neutral names.

--HG--
extra : convert_revision : 702c715b7516a16602172deb1b78d6a7ab848fd4

18 years agoDelete obsolete directories: src/oldmem, src/mem/timing, src/mem/NOTES.
Steve Reinhardt [Tue, 31 Oct 2006 04:53:20 +0000 (23:53 -0500)]
Delete obsolete directories: src/oldmem, src/mem/timing, src/mem/NOTES.

--HG--
extra : convert_revision : 948b4aaf484f7f7c2fce16201cd51ecb111af7d4

18 years agoFSConfig.py:
Lisa Hsu [Mon, 30 Oct 2006 21:55:52 +0000 (16:55 -0500)]
FSConfig.py:
Accidentally committed this last time

configs/common/FSConfig.py:
    Accidentally committed this last time

--HG--
extra : convert_revision : 32d49c17c661b57a9aa9c3b057258f6e037ba745

18 years agose.py, fs.py:
Lisa Hsu [Mon, 30 Oct 2006 21:51:46 +0000 (16:51 -0500)]
se.py, fs.py:
import Caches
Simulation.py:
Fix typo - L2Cache --> L1Cache

configs/common/Simulation.py:
    Fix typo - L2Cache --> L1Cache
configs/example/fs.py:
configs/example/se.py:
    import Caches

--HG--
extra : convert_revision : 4292225b322c069665262eab7c83b5341844fba0

18 years agoensure that there is a "/" between the cptdir and the cpt.%d.
Lisa Hsu [Mon, 30 Oct 2006 19:19:16 +0000 (14:19 -0500)]
ensure that there is a "/" between the cptdir and the cpt.%d.

--HG--
extra : convert_revision : 9aed7c3aecad10b039f3cfb26e04a7950be6bed1

18 years agoMerge zizzer:/bk/newmem
Lisa Hsu [Mon, 30 Oct 2006 19:15:50 +0000 (14:15 -0500)]
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : 836fcb45f399ed4f860be2d0bfe2ac4709bfe2ef

18 years agodecouple the switch option from the warmup period option - parsing was confused other...
Lisa Hsu [Mon, 30 Oct 2006 19:12:15 +0000 (14:12 -0500)]
decouple the switch option from the warmup period option - parsing was confused otherwise, oops.

--HG--
extra : convert_revision : 951fc664c59363df5f5e026aa791d83c26f050ec

18 years agoUse some python os.path stuff to make it more flexible where we can execute this...
Kevin Lim [Mon, 30 Oct 2006 19:01:34 +0000 (14:01 -0500)]
Use some python os.path stuff to make it more flexible where we can execute this script from.

--HG--
extra : convert_revision : a76861a0f2669a7cd3bf3a34177739c69a913545

18 years agoMerge zizzer:/bk/newmem
Lisa Hsu [Mon, 30 Oct 2006 18:33:38 +0000 (13:33 -0500)]
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : ce5f394a4a62f7452b9631763425f65b911387bb

18 years agoadd some comments and make the warmup period in a switchover parameterizable.
Lisa Hsu [Mon, 30 Oct 2006 18:33:27 +0000 (13:33 -0500)]
add some comments and make the warmup period in a switchover parameterizable.

configs/common/Options.py:
    make the warmup period in a standard switch part of the option.
configs/common/Simulation.py:
    add some comments and also make the warmup period an option.

--HG--
extra : convert_revision : 0fa587291b97ff87c3b3a617e7359ac6d9bed7a5

18 years agoAn attempt to serialize the state of the micro code mechanism in the simple cpu.
Gabe Black [Sun, 29 Oct 2006 09:04:50 +0000 (04:04 -0500)]
An attempt to serialize the state of the micro code mechanism in the simple cpu.

src/cpu/simple/base.cc:
    Make a microcoded op start at the current micropc, rather than starting at 0.
src/cpu/thread_state.cc:
    Serialize the microPC and nextMicroPC

--HG--
extra : convert_revision : 5302215f17312ecef3ff4c6548acb05297ee4ff6

18 years agoMove the mem classes into util.isa so that multiple inheritance can be used in the...
Gabe Black [Sun, 29 Oct 2006 08:40:52 +0000 (03:40 -0500)]
Move the mem classes into util.isa so that multiple inheritance can be used in the future for micro insts.

--HG--
extra : convert_revision : c71faa5e43b56ed15d00ed5fd57c020d1c845445

18 years agoFix when the IsDelayedCommit flag is set.
Gabe Black [Sun, 29 Oct 2006 08:26:41 +0000 (03:26 -0500)]
Fix when the IsDelayedCommit flag is set.

--HG--
extra : convert_revision : ab6cd69f82b2013d66a91beaa3e39d8f417a9251

18 years agoBring casa and casxa up to date
Gabe Black [Sun, 29 Oct 2006 07:57:32 +0000 (02:57 -0500)]
Bring casa and casxa up to date

src/arch/sparc/isa/decoder.isa:
    Fix up the casa and casxa instructions.
src/arch/sparc/isa/formats/formats.isa:
    This is handled in loadstore.isa now
src/arch/sparc/isa/formats/mem/basicmem.isa:
src/arch/sparc/isa/formats/mem/blockmem.isa:
    Renamed doSplitExecute to doDualSplitExecute. This differentiates between the version that does both a register and immediate version, and one that just does a register version.
src/arch/sparc/isa/formats/mem/mem.isa:
    The cas format is handled in loadstore.isa as well now.
src/arch/sparc/isa/formats/mem/util.isa:
    Reorganized things a bit to better support cas

--HG--
extra : convert_revision : 12411e89e763287e52f9825bf7a417b263c1037f

18 years agoFixed ldstub to use the right format, and made the load/store operations use the...
Gabe Black [Sun, 29 Oct 2006 06:59:30 +0000 (01:59 -0500)]
Fixed ldstub to use the right format, and made the load/store operations use the integer microcode register.

--HG--
extra : convert_revision : 7df5bd4bbe8a2607c7d2b4799826831d6a440926

18 years agoAdd an integer microcode register.
Gabe Black [Sun, 29 Oct 2006 06:58:37 +0000 (01:58 -0500)]
Add an integer microcode register.

--HG--
extra : convert_revision : f23dbfdfe44e8e6cdd6948000669ad4f743b9fb4

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Sat, 28 Oct 2006 17:17:05 +0000 (13:17 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem.head

--HG--
extra : convert_revision : df73fd850d6638cbce6ff31203857f51235b8763

18 years agoremove intel nic from SConscript
Ali Saidi [Sat, 28 Oct 2006 17:16:53 +0000 (13:16 -0400)]
remove intel nic from SConscript

--HG--
extra : convert_revision : b01bb258c97cf42d46a94faedab31726623fe437

18 years agoThis one really needs to be arch/faults.hh
Gabe Black [Sat, 28 Oct 2006 08:44:05 +0000 (04:44 -0400)]
This one really needs to be arch/faults.hh

--HG--
extra : convert_revision : aad1ee04ade9f4394c9ef0386f23d6f2ca373412

18 years agoInclude the right version of faults.hh
Gabe Black [Sat, 28 Oct 2006 08:00:24 +0000 (04:00 -0400)]
Include the right version of faults.hh

--HG--
extra : convert_revision : 4762b8ab46ac755726cc658a378c2cf5b2061dc3

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Sat, 28 Oct 2006 07:48:23 +0000 (03:48 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem

--HG--
extra : convert_revision : 9883fb35fd9c36e1819153f9976f8bdc73dbe8f3

18 years agoOne last adjustment to get rid of skew in the simple atomic cpu.
Gabe Black [Sat, 28 Oct 2006 07:44:55 +0000 (03:44 -0400)]
One last adjustment to get rid of skew in the simple atomic cpu.

--HG--
extra : convert_revision : 8e46929ed7da5dae6888f773de4e1ecc9b249fe0

18 years agoMerge zizzer:/bk/newmem
Lisa Hsu [Fri, 27 Oct 2006 20:40:06 +0000 (16:40 -0400)]
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

configs/example/fs.py:
configs/example/se.py:
    hand merge

--HG--
extra : convert_revision : 13d248add87ac373d2653bb42adf4ac065f75ce3

18 years agofactor out common run code from se.py and fs.py.
Lisa Hsu [Fri, 27 Oct 2006 20:32:26 +0000 (16:32 -0400)]
factor out common run code from se.py and fs.py.

configs/example/fs.py:
    factor out common code.
configs/example/se.py:
    factor out common code

--HG--
extra : convert_revision : 72a1f653c84eae1b7d281e0a5e60ee116ad6b27d

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Fri, 27 Oct 2006 13:11:02 +0000 (09:11 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem.head

--HG--
extra : convert_revision : b8b8a4428b2462d2df600e2ec7a9014a08246df8

18 years agoadd packet_access.hh
Ali Saidi [Fri, 27 Oct 2006 13:10:50 +0000 (09:10 -0400)]
add packet_access.hh

--HG--
extra : convert_revision : 7fe4958549101fca9613baa4a317d96f4970d432

18 years agoA more complete attempt to fix the clock skew.
Gabe Black [Fri, 27 Oct 2006 11:09:14 +0000 (07:09 -0400)]
A more complete attempt to fix the clock skew.

--HG--
extra : convert_revision : b2d505de51fc5fcae5177b2a13140729474e249e

18 years agoPotential fix to clock skew problem.
Gabe Black [Fri, 27 Oct 2006 10:51:28 +0000 (06:51 -0400)]
Potential fix to clock skew problem.

--HG--
extra : convert_revision : 51572523190a886fd0ff64817edc88e260c5fa9d

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Fri, 27 Oct 2006 06:34:26 +0000 (02:34 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem

--HG--
extra : convert_revision : ec35a9276ae21e0b9fe820bd700c020e4440a350

18 years agoUpdate stats for fill/spill handlers
Gabe Black [Fri, 27 Oct 2006 06:21:09 +0000 (02:21 -0400)]
Update stats for fill/spill handlers

--HG--
extra : convert_revision : 2ed2e868ccbb3316f84ea691497d2e0dd4ec2416

18 years agoGot rid of some outdated comments.
Gabe Black [Fri, 27 Oct 2006 05:43:51 +0000 (01:43 -0400)]
Got rid of some outdated comments.

--HG--
extra : convert_revision : 30fa768c4a934cf5f9dc0ad84e0e421327ccbed3

18 years agoMade the regfile compatible with the new definitions in MiscRegFile
Gabe Black [Fri, 27 Oct 2006 05:43:26 +0000 (01:43 -0400)]
Made the regfile compatible with the new definitions in MiscRegFile

--HG--
extra : convert_revision : d63ea6fb1e549e737204ee6653c06f89ec5e43ef

18 years agoClean up MiscRegFile
Gabe Black [Fri, 27 Oct 2006 05:36:42 +0000 (01:36 -0400)]
Clean up MiscRegFile

--HG--
extra : convert_revision : 3bc792596c99df3a5c2c82da58b801a63ccf6ddb

18 years agoReorganized the MiscRegFile
Gabe Black [Fri, 27 Oct 2006 02:48:02 +0000 (22:48 -0400)]
Reorganized the MiscRegFile

--HG--
extra : convert_revision : 088112c9b8a4ea09c8015da5a0b65ed2fc9398d2

18 years agoCleaned up the decoder slightly.
Gabe Black [Fri, 27 Oct 2006 02:47:17 +0000 (22:47 -0400)]
Cleaned up the decoder slightly.

--HG--
extra : convert_revision : a7050aa8768c132f0161f00ba17ae02d71f0b829

18 years agoAdded a few functions to stuff values into bitfields in an instruction.
Gabe Black [Fri, 27 Oct 2006 00:25:22 +0000 (20:25 -0400)]
Added a few functions to stuff values into bitfields in an instruction.

--HG--
extra : convert_revision : 507d7e13fd6276acf36b75eba31dff5e8080113f

18 years agoChanged the number of register windows to be more realistic.
Gabe Black [Fri, 27 Oct 2006 00:24:01 +0000 (20:24 -0400)]
Changed the number of register windows to be more realistic.

--HG--
extra : convert_revision : ae557307f377b19bae82226dafa8b4b2654cae52

18 years agoGot rid of some debug output
Gabe Black [Fri, 27 Oct 2006 00:23:00 +0000 (20:23 -0400)]
Got rid of some debug output

--HG--
extra : convert_revision : 6e98cf839dc92bde5f06f9b9bf11ca6ac661c907

18 years agoChange the default function from setMiscRegWithEffect to setMiscReg
Gabe Black [Fri, 27 Oct 2006 00:22:23 +0000 (20:22 -0400)]
Change the default function from setMiscRegWithEffect to setMiscReg

--HG--
extra : convert_revision : bedf422d51a52b009390b1e94f5330f752be2b87

18 years agoMerge zizzer:/bk/newmem
Lisa Hsu [Thu, 26 Oct 2006 20:04:27 +0000 (16:04 -0400)]
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/clean

--HG--
extra : convert_revision : cb3f718bdcbd52540747a2696fb37bb4fcfe27a3

18 years agose.py:
Lisa Hsu [Thu, 26 Oct 2006 20:04:09 +0000 (16:04 -0400)]
se.py:
make the same os.getcwd fix ali made in fs.py, make connectMemPorts occur after caches are created.

configs/example/se.py:
    make the same os.getcwd fix ali made in fs.py, make connectMemPorts occur after caches are created.

--HG--
extra : convert_revision : 9760ae073d97cd62d3e44f10199d31cce79d4a1d

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Thu, 26 Oct 2006 19:49:19 +0000 (15:49 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem.head

--HG--
extra : convert_revision : 473901bcd44bd2c563a3293d7326cd5aed8b630f

18 years agoFix simple timing port keep a list of all packets, have only one event, and scan...
Ali Saidi [Wed, 25 Oct 2006 22:34:21 +0000 (18:34 -0400)]
Fix simple timing port keep a list of all packets, have only one event, and scan all packets on a functional access.

--HG--
extra : convert_revision : c735a6408443b5cc90d1c1841c7aeb61e02ec6ae

18 years agoFixed the priv instruction format.
Gabe Black [Wed, 25 Oct 2006 21:58:44 +0000 (17:58 -0400)]
Fixed the priv instruction format.

src/arch/sparc/isa/formats/priv.isa:
    Fix the priv format so that it uses isa_parser operands rather than accessing the registers directly in checkCode. Also, the expressions needed to be negated.
src/arch/sparc/isa/operands.isa:
    Added an Hpstate operand, and adjusted the numbering.

--HG--
extra : convert_revision : 4a70862df061aa9e1b9eab125c4c2fc839ac3b5a

18 years agoImplemented the saved and restored instructions, fixed up register window instruction...
Gabe Black [Wed, 25 Oct 2006 21:54:14 +0000 (17:54 -0400)]
Implemented the saved and restored instructions, fixed up register window instructions so that the cwp is modified at the correct time (when handling the fault), and fixed the "done" instruction.

--HG--
extra : convert_revision : 3c9144422f087af1d375782cce1c9b77ca7936c9

18 years agoFixed the bitfield FCN to include the right bits.
Gabe Black [Wed, 25 Oct 2006 21:50:39 +0000 (17:50 -0400)]
Fixed the bitfield FCN to include the right bits.

--HG--
extra : convert_revision : 040beb4dd982784773c3c3ad04cc48c2dc98b58c

18 years agoImplemented the SPARC fill and spill handlers.
Gabe Black [Wed, 25 Oct 2006 21:49:41 +0000 (17:49 -0400)]
Implemented the SPARC fill and spill handlers.

src/arch/sparc/faults.cc:
src/arch/sparc/faults.hh:
    Added a function to do normal SPARC trap processing, and implemented the spill and fill faults for SE
src/arch/sparc/process.cc:
src/arch/sparc/process.hh:
    Added fill and spill handlers which are stuffed into the processes address space. The location of these handlers are stored in fillStart and spillStart.

--HG--
extra : convert_revision : 59adb96570cce86f373fbc2c3e4c05abe1742d3b

18 years agoFix fixPacket functionality to calculate sizes properly
Ron Dreslinski [Wed, 25 Oct 2006 18:14:37 +0000 (14:14 -0400)]
Fix fixPacket functionality to calculate sizes properly

src/mem/packet.cc:
    Copy size is calculated by END-BEGIN not BEGIN-END

--HG--
extra : convert_revision : 0e2725c5551f8f70ff05cb285e0822afc0bb3f87

18 years agoReplace the Alpha No op with a SPARC one.
Gabe Black [Tue, 24 Oct 2006 19:50:41 +0000 (15:50 -0400)]
Replace the Alpha No op with a SPARC one.

--HG--
extra : convert_revision : bed03e63dc80bf24f21bad08e6553d7aab92c7b3

18 years agoFix fs.py. Lisa did you test this? Is there some wierd python version thing?
Ali Saidi [Tue, 24 Oct 2006 17:10:31 +0000 (13:10 -0400)]
Fix fs.py. Lisa did you test this? Is there some wierd python version thing?

--HG--
extra : convert_revision : 6df5f90d5b66e7af27d4f524744b9dc3c703a588

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Tue, 24 Oct 2006 16:59:19 +0000 (12:59 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem.head

--HG--
extra : convert_revision : 4db140e6e8408b3ed39da327515b8e88a2701e6b

18 years agoAdd more traceflags for ethernet
Ali Saidi [Tue, 24 Oct 2006 16:59:07 +0000 (12:59 -0400)]
Add more traceflags for ethernet

--HG--
extra : convert_revision : a5025f501d72626d1bcb4dcc24ee353ceb160ce7

18 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Steve Reinhardt [Tue, 24 Oct 2006 15:50:20 +0000 (11:50 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

--HG--
extra : convert_revision : a077304e608753f50f4a12216901d156469eebe4

18 years agowarmup of 1B cpu cycles.
Lisa Hsu [Mon, 23 Oct 2006 23:32:57 +0000 (19:32 -0400)]
warmup of 1B cpu cycles.

configs/example/fs.py:
configs/example/se.py:
    warm up of 1B CPU cycles

--HG--
extra : convert_revision : 0f3263f466fde4cd86e0663930e83617a6b3faad

18 years agoMerge zizzer:/bk/newmem
Lisa Hsu [Mon, 23 Oct 2006 22:46:05 +0000 (18:46 -0400)]
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : bb58679e101570d50c040519fb08ffbabfee7416

18 years agoget rid of the "resume" step at the end of changeToTiming/Atomic because this will...
Lisa Hsu [Mon, 23 Oct 2006 22:45:30 +0000 (18:45 -0400)]
get rid of the "resume" step at the end of changeToTiming/Atomic because this will cause an assertion when you do the CPU switch.  instead, push the responsibility of the resume upwards towards the user - documented in se.py and fs.py so it should be ok.

--HG--
extra : convert_revision : 7530cf140844e18cc26df80057f8760f29ec952b

18 years agomake this parallel to the other cpu types so that resume works correctly.
Lisa Hsu [Mon, 23 Oct 2006 22:43:56 +0000 (18:43 -0400)]
make this parallel to the other cpu types so that resume works correctly.

--HG--
extra : convert_revision : 3c165af27ea0e6c7f2a17819c1717d8900f54cc1

18 years agomake a lot of the same changes as to fs.py for checkpointing.
Lisa Hsu [Mon, 23 Oct 2006 22:42:46 +0000 (18:42 -0400)]
make a lot of the same changes as to fs.py for checkpointing.

1) rearrange the options to be in a nice logical order
2) add an option for what i call "standard switch", which is from simple->timing->detailed
3) make checkpointing code such that checkpoints taken from the command line override checkpoint instructions compiled into binaries.
4) add an option for maximum number of checkpoints - simulation will stop at max or maxtick, whichever is first

--HG--
extra : convert_revision : 8d905e1b297ae664d60f8c8ba48b2aac25437fc6

18 years agochanges regarding fs.py
Lisa Hsu [Mon, 23 Oct 2006 22:07:51 +0000 (18:07 -0400)]
changes regarding fs.py

1) rearrange the options to be in a nice logical order
2) add an option for what i call "standard switch", which is from simple->timing->detailed
3) change the client/server naming system to testsys/drivesys
4) make checkpointing code such that checkpoints taken from the command line override checkpoint instructions compiled into binaries.
5) add an option for maximum number of checkpoints - simulation will stop at max or maxtick, whichever is first

doesn't fully work because of a caching issue, but the python side of things i think should work - the counterpart of se.py does work.
i think i should factor out a lot of the common code in both, but i'll do that after this checkin, just to get this in the tree.

configs/example/fs.py:
    1) rearrange the options to be in a nice logical order
    2) add an option for what i call "standard switch", which is from simple->timing->detailed
    3) change the client/server naming system to testsys/drivesys
    4) make checkpointing code such that checkpoints taken from the command line override checkpoint instructions compiled into binaries.
    5) add an option for maximum number of checkpoints - simulation will stop at max or maxtick, whichever is first

--HG--
extra : convert_revision : 078e22800ff83f6e950bf5cc6fb16a98320e7c51

18 years agoMinor compile fix. Not sure why this is broken.
Gabe Black [Mon, 23 Oct 2006 15:17:59 +0000 (11:17 -0400)]
Minor compile fix. Not sure why this is broken.

--HG--
extra : convert_revision : 6f181b15f37114ca0a3965cabcb2036bd2f97916

18 years agoMove around more SPARC memory code, and make block memory operations work with the...
Gabe Black [Mon, 23 Oct 2006 15:17:15 +0000 (11:17 -0400)]
Move around more SPARC memory code, and make block memory operations work with the timing cpu

--HG--
extra : convert_revision : 37358504c4d05d78d08c19ba3d0c99d38c4babf5

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Mon, 23 Oct 2006 13:44:58 +0000 (09:44 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem

--HG--
extra : convert_revision : cb15101d24ef2969e1819d6bdeeb2dd1f23f02d1

18 years agoAdd reference outputs for SPARC on the atomic timing cpu model
Gabe Black [Mon, 23 Oct 2006 11:57:16 +0000 (07:57 -0400)]
Add reference outputs for SPARC on the atomic timing cpu model

--HG--
extra : convert_revision : b64ff7c05504da6112631baaae8f0d927469e16f

18 years agoBroke Load/Store instructions into microcode, and partially refactored memory operati...
Gabe Black [Mon, 23 Oct 2006 11:55:52 +0000 (07:55 -0400)]
Broke Load/Store instructions into microcode, and partially refactored memory operations in the SPARC ISA description.

--HG--
rename : src/arch/sparc/isa/formats.isa => src/arch/sparc/isa/formats/formats.isa
rename : src/arch/sparc/isa/formats/mem.isa => src/arch/sparc/isa/formats/mem/basicmem.isa
rename : src/arch/sparc/isa/formats/blockmem.isa => src/arch/sparc/isa/formats/mem/blockmem.isa
rename : src/arch/sparc/isa/formats/mem.isa => src/arch/sparc/isa/formats/mem/mem.isa
extra : convert_revision : dbbb00f997a102871b084b209b9fa08c5e1853ee