gem5.git
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 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 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 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

18 years agoset TRACING_ON one way or another explicitly in the
Nathan Binkert [Sun, 12 Nov 2006 04:46:56 +0000 (20:46 -0800)]
set TRACING_ON one way or another explicitly in the
SConscript file instead of basing it on DEBUG

--HG--
extra : convert_revision : 6e6807cc4350ef92baeaaabfeb3dc0bb785128ba

18 years agoDelete the actual PseudoInst file
Nathan Binkert [Sun, 12 Nov 2006 01:30:37 +0000 (17:30 -0800)]
Delete the actual PseudoInst file

--HG--
extra : convert_revision : 54e3dfbc1022fcc663a9c0e67f6434395d1fe33c

18 years agoGet rid of the ParamContext for pseudo instructions and move
Nathan Binkert [Sun, 12 Nov 2006 01:22:10 +0000 (17:22 -0800)]
Get rid of the ParamContext for pseudo instructions and move
the parameters to the BaseCPU object.

--HG--
extra : convert_revision : 557292cffb40918133647b0c9ac653ee5112df2e

18 years agoFix for CAS so that it knows about all the possible code in the constructor.
Gabe Black [Sat, 11 Nov 2006 12:23:13 +0000 (07:23 -0500)]
Fix for CAS so that it knows about all the possible code in the constructor.

--HG--
extra : convert_revision : 863d395f8e7c8ee2aec708ffcef842317ec9a89b

18 years agoThe Lock_Flag_DepTag went away earlier, and using TheISA gives the false impression...
Gabe Black [Sat, 11 Nov 2006 12:16:24 +0000 (07:16 -0500)]
The Lock_Flag_DepTag went away earlier, and using TheISA gives the false impression that this code is ISA independent.

--HG--
extra : convert_revision : 67d9e51702efbe5f5244268e3753328a6cf1a1d5

18 years agoCertain header files should only be used in FS.
Gabe Black [Sat, 11 Nov 2006 12:15:16 +0000 (07:15 -0500)]
Certain header files should only be used in FS.

src/arch/alpha/faults.hh:
    Only use pagetable.hh in FS
src/arch/alpha/pagetable.hh:
    pagetable.hh should only be included in FS, so protecting it internally should be unnecessary.
src/cpu/exetrace.cc:
    Only use tlb.hh in FS

--HG--
extra : convert_revision : 91ea61f2e7970e7146b6d407ee250fcb20cd4d48

18 years agoMore fixes for functional accesses. It now makes the writeback memory leak to crash...
Ron Dreslinski [Sat, 11 Nov 2006 03:45:50 +0000 (22:45 -0500)]
More fixes for functional accesses.  It now makes the writeback memory leak to crash all configs.
Working on that now.

src/mem/cache/base_cache.cc:
    Keep a list of the responders so we can search them on functional accesses.
src/mem/cache/base_cache.hh:
    Properly put things on a list for responses so we can search the list.
    Also, be sure to check the outgoing ports lists on a functional access (factor some common code out there)
src/mem/cache/cache_impl.hh:
    Properly return when the first read hit on a functional access.
    Make sure to call to check the other ports list of packets before forwarding it out.

--HG--
extra : convert_revision : 1d21cb55ff29c15716617efc48441329707c088a

18 years agoBig fix for functional access, where we forgot to copy the last byte on write interse...
Ron Dreslinski [Sat, 11 Nov 2006 03:41:21 +0000 (22:41 -0500)]
Big fix for functional access, where we forgot to copy the last byte on write intersections.

src/mem/packet.cc:
    Make sure to copy the whole data (we were one byte short)
src/mem/tport.cc:
    Fix for the proper semantics of fixPacket

--HG--
extra : convert_revision : 215e05db9099d427afd4994f5b29079354c847d8

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Sat, 11 Nov 2006 01:17:54 +0000 (20:17 -0500)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : e4f9bb663099662a94c5522e6b4955c2a83bac8d

18 years agofix endian issues with condition codes
Ali Saidi [Sat, 11 Nov 2006 01:17:42 +0000 (20:17 -0500)]
fix endian issues with condition codes
use memcpy instead of bcopy
s/u_int32_t/uint32_t/g
fixup endian code to work with solaris
hack to make sure htole() works... Nate, have a good idea to fix this?

src/arch/sparc/faults.cc:
    set the reset address to be 40 bits. Makes PC printing easier at least for now.
src/arch/sparc/isa/base.isa:
    fix endian issues with condition codes
src/arch/sparc/tlb.hh:
    add implemented physical addres constants
src/arch/sparc/utility.hh:
    add tlb.hh to utilities
src/base/loader/raw_object.cc:
    add a symbol <filename>_start to the symbol table for binaries files
src/base/remote_gdb.cc:
    use memcpy instead of bcopy
src/cpu/exetrace.cc:
    clean up printing a bit more
src/cpu/m5legion_interface.h:
    add tons to the shared interface
src/dev/ethertap.cc:
    s/u_int32_t/uint32_t/g
src/dev/ide_atareg.h:
    fixup endian code to work with solaris
src/dev/pcidev.cc:
src/sim/param.hh:
    hack to make sure htole() works...

--HG--
extra : convert_revision : 4579392184b40bcc1062671a953c6595c685e9b2

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Fri, 10 Nov 2006 20:35:06 +0000 (15:35 -0500)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

--HG--
extra : convert_revision : 35e2ff6ce62281299ad98dca64ba04a3a8a6757c

18 years agoElaborated on the tlb stubs so that they just set the physical address to the virtual...
Gabe Black [Fri, 10 Nov 2006 20:32:15 +0000 (15:32 -0500)]
Elaborated on the tlb stubs so that they just set the physical address to the virtual address.

--HG--
extra : convert_revision : 41478abc4d21d504420f6842338675c0767f7cf9

18 years agoFixed up DepTags a little. I think NumMicroIntRegs shouldn't be added to Ctrl_Base_De...
Gabe Black [Fri, 10 Nov 2006 20:30:59 +0000 (15:30 -0500)]
Fixed up DepTags a little. I think NumMicroIntRegs shouldn't be added to Ctrl_Base_DepTag.

--HG--
extra : convert_revision : 2ebb3eb781441ba936c8d8bb1f42e4c0840aff2e

18 years agoAdded StrandStsReg operand.
Gabe Black [Fri, 10 Nov 2006 20:29:32 +0000 (15:29 -0500)]
Added StrandStsReg operand.

--HG--
extra : convert_revision : 51be41716ed9fe0e99e53f2341ad5651a525055a

18 years agoPut in provisions for rd, rdpr, rdhpr, wr, wrpr, and wrhpr to disassemble properly.
Gabe Black [Fri, 10 Nov 2006 20:28:58 +0000 (15:28 -0500)]
Put in provisions for rd, rdpr, rdhpr, wr, wrpr, and wrhpr to disassemble properly.

--HG--
extra : convert_revision : f2cad8a5879999438ba9b05f15a91320e7a4cc4a

18 years agoMade the annul of unconditional conditional branches behave properly, added code...
Gabe Black [Fri, 10 Nov 2006 20:27:06 +0000 (15:27 -0500)]
Made the annul of unconditional conditional branches behave properly, added code to read and write the strand_sts_reg, and made restored a Priv instruction.

--HG--
extra : convert_revision : 386512215f7243d230717c369217f8d2f9ada935

18 years agoFixed up the code that prints out registers to take into account microregisters.
Gabe Black [Fri, 10 Nov 2006 20:25:52 +0000 (15:25 -0500)]
Fixed up the code that prints out registers to take into account microregisters.

--HG--
extra : convert_revision : 6809de467e4500ce34447c0544caf0ba04af81e7

18 years agoTweaked debug output.
Gabe Black [Fri, 10 Nov 2006 20:25:03 +0000 (15:25 -0500)]
Tweaked debug output.

--HG--
extra : convert_revision : cd33b7c1ebdbefd42f18c1435b2519d06d9914a6

18 years agoTouched up faults, and made POR actually do something.
Gabe Black [Fri, 10 Nov 2006 20:24:10 +0000 (15:24 -0500)]
Touched up faults, and made POR actually do something.

--HG--
extra : convert_revision : 38951352edbfc423fb6767a9aac49a703578c0ac

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Fri, 10 Nov 2006 17:44:15 +0000 (12:44 -0500)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

--HG--
extra : convert_revision : 0c2db1e1b5fdb91c1ac5705ab872a6bfb575a67a

18 years agoAlso include a function to form the input path.
Kevin Lim [Fri, 10 Nov 2006 17:39:43 +0000 (12:39 -0500)]
Also include a function to form the input path.

--HG--
extra : convert_revision : d2141e3b8c56296fbbe2c4c1ceb80616f269884a

18 years agoTry to setup commands properly.
Kevin Lim [Fri, 10 Nov 2006 17:28:23 +0000 (12:28 -0500)]
Try to setup commands properly.

--HG--
extra : convert_revision : 9f4af3c5f52841b10e9f17c48470716703a1be67

18 years agoChange up some warnings to DPRINTFs.
Kevin Lim [Fri, 10 Nov 2006 17:25:08 +0000 (12:25 -0500)]
Change up some warnings to DPRINTFs.

--HG--
extra : convert_revision : b3e9fa094d68f608865dedfc9f3f4125a20fd748

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Fri, 10 Nov 2006 17:14:38 +0000 (12:14 -0500)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : 56cb7fe3be5b63bd89b48ac6cb88b47d13b4c137

18 years agoActually finished moving the register file stuff around.
Gabe Black [Fri, 10 Nov 2006 10:49:16 +0000 (05:49 -0500)]
Actually finished moving the register file stuff around.

--HG--
extra : convert_revision : 786735ecea8ff480db6b3754ac5daa562938d988

18 years agoMoved the Alpha float regfile into it's own regfile and got rid of constants.hh and...
Gabe Black [Fri, 10 Nov 2006 10:29:05 +0000 (05:29 -0500)]
Moved the Alpha float regfile into it's own regfile and got rid of constants.hh and isa_traits.cc

--HG--
extra : convert_revision : 55afd7d21c276906520da375b3bbb563be420880

18 years agoSplit out alpha integer register file into it's own files.
Gabe Black [Fri, 10 Nov 2006 09:54:25 +0000 (04:54 -0500)]
Split out alpha integer register file into it's own files.

--HG--
extra : convert_revision : 164bdcec2860c5dca3f0f11d189781b88dd717cb

18 years agoThe reset function of the MiscRegFile really resets it now. This function is called...
Gabe Black [Fri, 10 Nov 2006 09:33:41 +0000 (04:33 -0500)]
The reset function of the MiscRegFile really resets it now. This function is called from the class's constructor.

--HG--
extra : convert_revision : 4e7a40ffe0a9a71fd1b2b171d9c0dcac50e1a1fe

18 years agoSet the ASI register to be something explicitly so that simulation is deterministic.
Gabe Black [Fri, 10 Nov 2006 09:14:25 +0000 (04:14 -0500)]
Set the ASI register to be something explicitly so that simulation is deterministic.

--HG--
extra : convert_revision : 38cd06f946fc0cc22288f71f567e77ce8fdfea99

18 years agoChange exetrace code for working with my trace tool to use stream io rather than...
Gabe Black [Fri, 10 Nov 2006 09:11:46 +0000 (04:11 -0500)]
Change exetrace code for working with my trace tool to use stream io rather than sprintf which was breaking on 64 bit hosts.

--HG--
extra : convert_revision : 184d751392dfcc8c80ac1a6c0ebc3061ff0a3f20

18 years agoFix up instructions to read and write control registers, and got rid of the control...
Gabe Black [Fri, 10 Nov 2006 09:02:39 +0000 (04:02 -0500)]
Fix up instructions to read and write control registers, and got rid of the control register fields which won't work on a big endian host.

--HG--
extra : convert_revision : 1b518873b6e1a073b58cbe27642537d5ae3a604d

18 years agoMoved the Alpha MiscRegFile into it's own file, and got rid of the Alpha specific...
Gabe Black [Fri, 10 Nov 2006 02:30:48 +0000 (21:30 -0500)]
Moved the Alpha MiscRegFile into it's own file, and got rid of the Alpha specific DepTag constants.

--HG--
extra : convert_revision : e4af5e2fb2a6953f8837ad9bda309b7d6fa7abfb

18 years agoFix a couple uninitialized variables.
Gabe Black [Fri, 10 Nov 2006 00:24:35 +0000 (19:24 -0500)]
Fix a couple uninitialized variables.

--HG--
extra : convert_revision : d17d28a9520524e5f56bd79beb9b2be6ce76a22f

18 years agoGet SPARC to the point that it starts running. Add ability to load the ROM bin files...
Ali Saidi [Thu, 9 Nov 2006 23:22:46 +0000 (18:22 -0500)]
Get SPARC to the point that it starts running. Add ability to load the ROM bin files, cleanup lockstep printing a bit
Since we don't have a platform yet, you need to comment out the default responder stuff in Bus.py to make it work.

SConstruct:
    Add TARGET_ISA to the list of environment variables that end up in the build_env for python
configs/common/FSConfig.py:
    add a simple SPARC system to being testing with, you'll need to change makeLinuxAlphaSystem to makeSparcSystem in fs.py for now
src/SConscript:
    add a raw file object, at least until we get more info about how to compile openboot properly
src/arch/sparc/system.cc:
src/arch/sparc/system.hh:
    add parameters for ROM files (OBP/Reset/Hypervisor), a ROM, load files into ROM
src/base/loader/object_file.cc:
src/base/loader/object_file.hh:
    add option to try raw when nothing works
src/cpu/exetrace.cc:
    cleanup lockstep printing a little bit
src/cpu/m5legion_interface.h:
    change the instruction to be 32 bits because it is
src/mem/physical.cc:
    fix assert that doesn't work if memory starts somewhere above 0
src/python/m5/objects/BaseCPU.py:
    Add if statement to choose between sparc tlbs and alpha tlbs
src/python/m5/objects/System.py:
    Add a sparc system that sets the rom addresses correctly
src/python/m5/params.py:
    add the ability to add Addr() together

--HG--
extra : convert_revision : bbbd8a56134f2dda2728091f740e2f7119b0c4af

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

--HG--
extra : convert_revision : dafe2d4a032b277c219ea13faf20567c20c1f2f4

18 years agoClean up config scripts to not have to worry about attaching a cache only to the...
Kevin Lim [Thu, 9 Nov 2006 20:05:13 +0000 (15:05 -0500)]
Clean up config scripts to not have to worry about attaching a cache only to the TimingCPU.  Now the Atomic CPU works with caches.

configs/common/Simulation.py:
    Atomic CPU now works properly with caches, so we don't have to do extra parsing to hook up caches only to the timing CPU.

    However the O3CPU must always use caches, so a check for that must still exist.

    Also change the switch_cpus to be placed at the system level, now that Steve changed how the IntrController gets its CPU.
configs/example/fs.py:
configs/example/se.py:
    Atomic CPU now handles caches.

--HG--
extra : convert_revision : 534ded558ef96cafd76b4b5c5317bd8f4d05076e

18 years agoFactor out all of the encumbered stuff into separate SConscript
Nathan Binkert [Thu, 9 Nov 2006 16:43:35 +0000 (08:43 -0800)]
Factor out all of the encumbered stuff into separate SConscript
files so the directories can easily be deleted.
Remove the FullCPU from the ALL_CPU_LIST and only add it if
it exists.

--HG--
extra : convert_revision : b16f56bb92a0063803c5099732dc289fe4363768

18 years agoBe sure to populate the packet's finishTime field in the atomic timing case.
Kevin Lim [Thu, 9 Nov 2006 16:37:26 +0000 (11:37 -0500)]
Be sure to populate the packet's finishTime field in the atomic timing case.

--HG--
extra : convert_revision : ef34818eb2dea5b3a8e754bf56745a7cd2497bf0

18 years agoDraining fixes.
Kevin Lim [Thu, 9 Nov 2006 16:33:44 +0000 (11:33 -0500)]
Draining fixes.

src/cpu/o3/cpu.cc:
    Handle draining properly when CPU isn't actually being used.
src/cpu/simple/atomic.cc:
    Be sure to set status properly when draining.
src/mem/bus.cc:
    Fix for draining.

--HG--
extra : convert_revision : d9796e6693e974f022159029fc9743c49a970c8f

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem/
Gabe Black [Wed, 8 Nov 2006 21:52:44 +0000 (16:52 -0500)]
Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : 0ab912df014cf1511e960e4058bee3eea047f9f6

18 years agothe tests assume -1 to signify MaxTick, that's changed, so fix that here.
Lisa Hsu [Wed, 8 Nov 2006 21:49:59 +0000 (16:49 -0500)]
the tests assume -1 to signify MaxTick, that's changed, so fix that here.

--HG--
extra : convert_revision : 73ff143ba3b733f80ab867fcd72489cd1ee49d76

18 years agoMerge zizzer.eecs.umich.edu:/bk/newmem/
Gabe Black [Wed, 8 Nov 2006 21:18:10 +0000 (16:18 -0500)]
Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : dc165840841bdd88e40111b98d1be493441703f0

18 years agoPut the MIPS stacktrace into the MipsISA namespace to fit with Alpha and SPARC.
Gabe Black [Wed, 8 Nov 2006 21:15:20 +0000 (16:15 -0500)]
Put the MIPS stacktrace into the MipsISA namespace to fit with Alpha and SPARC.

--HG--
extra : convert_revision : 86f5585fe9ceb2ee30836d35384ebcddc1357c2a

18 years agoMake a function to say how big gdbregs is in bytes vs. regs.
Gabe Black [Wed, 8 Nov 2006 20:31:52 +0000 (15:31 -0500)]
Make a function to say how big gdbregs is in bytes vs. regs.

--HG--
extra : convert_revision : 10c50c2d45a8e510d71cccde520059363116da8a

18 years agoMerge zizzer:/bk/newmem
Lisa Hsu [Wed, 8 Nov 2006 20:07:31 +0000 (15:07 -0500)]
Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : 5f4b39beba9f672ba1741cb45f4c3cf853ce574b

18 years agoMerge zizzer:/bk/newmem
Ali Saidi [Wed, 8 Nov 2006 20:06:17 +0000 (15:06 -0500)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 643e28482e6739bd264a9c2d69c17279853aa0c5

18 years agoDWARF2 symbol support seems to be broken on Solaris. Use stabs+
Ali Saidi [Wed, 8 Nov 2006 20:05:54 +0000 (15:05 -0500)]
DWARF2 symbol support seems to be broken on Solaris. Use stabs+
align the character arrays that are used by placement-new for classes lest we have an unaligned fault on SPARC/Solaris

src/SConscript:
    DWARF2 symbol support seems to be broken on Solaris. Use stabs+
src/base/statistics.hh:
    align the character arrays that are used by placement-new for classes lest we have an unaligned fault on SPARC/Solaris

--HG--
extra : convert_revision : bc875a4fdfb4553062d3278537bc32a5ab9b6cca

18 years agosimplify maxtick parsing in both the python and the c++.
Lisa Hsu [Wed, 8 Nov 2006 20:05:23 +0000 (15:05 -0500)]
simplify maxtick parsing in both the python and the c++.

configs/common/Simulation.py:
    simplify maxtick code a little bit - instead of checking for -1, just set it at MaxTick.
src/python/m5/__init__.py:
    make a new m5 param called MaxTick.
src/sim/host.hh:
    fix the M5 def. of MaxTick
src/sim/main.cc:
    Simplify the MaxTick/num_cycles parsing within main.cc

--HG--
extra : convert_revision : f800addfbc1323591c2e05b892276b439b671668

18 years agomake rcS files read from the m5 source directory, not /dist.
Lisa Hsu [Wed, 8 Nov 2006 19:10:25 +0000 (14:10 -0500)]
make rcS files read from the m5 source directory, not /dist.

--HG--
extra : convert_revision : 45a2dbf5b05b19dd60fbc3a5b10e9355c8351e3b

18 years agochange to os.path.join like nate wanted.
Lisa Hsu [Wed, 8 Nov 2006 19:01:23 +0000 (14:01 -0500)]
change to os.path.join like nate wanted.

--HG--
extra : convert_revision : 6e8a0153adf04f0cc07904434e4cb6a83fe900eb

18 years agoFirst cut at full blown SPARC faults. There are a few details that are missing.
Gabe Black [Wed, 8 Nov 2006 18:58:00 +0000 (13:58 -0500)]
First cut at full blown SPARC faults. There are a few details that are missing.

--HG--
extra : convert_revision : 8023db1479cb9bf99fc9edfeb521c4e5b581f895

18 years agoMove the check to see if you're in user mode into the isa directory.
Gabe Black [Wed, 8 Nov 2006 18:55:48 +0000 (13:55 -0500)]
Move the check to see if you're in user mode into the isa directory.

--HG--
extra : convert_revision : b5b7cdf4a5e5e54228c592093516bf18d0f7dbe6

18 years agoRemove mem parameter. Should have been removed earlier.
Kevin Lim [Wed, 8 Nov 2006 18:04:36 +0000 (13:04 -0500)]
Remove mem parameter.  Should have been removed earlier.

src/python/m5/objects/BaseCPU.py:
    These parameters should have been removed in an earlier push.

--HG--
extra : convert_revision : 781b39ca370361e9568b1af0be96ff5848b1f3f4

18 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Wed, 8 Nov 2006 16:41:10 +0000 (11:41 -0500)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : 29426cebe81ac077c1a83f50e914ff6955ce81d4

18 years agoUpdate refs.
Kevin Lim [Wed, 8 Nov 2006 16:40:59 +0000 (11:40 -0500)]
Update refs.

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/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-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/config.ini:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out:
    Update config.
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr:
tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr:
    Update ref.

--HG--
extra : convert_revision : ca4fe7ff5bf9fcd112b703b88a5196a312c594ab

18 years agoSorted faults by the trap type constant, expanded their names, added in new faults...
Gabe Black [Wed, 8 Nov 2006 15:27:38 +0000 (10:27 -0500)]
Sorted faults by the trap type constant, expanded their names, added in new faults for ua2005, and commented out ones which are apparently dropped.

--HG--
extra : convert_revision : 32bd0c3a75d7c036ad4a3cb0bc1c32e0b6cb3d87

18 years agoFix for slightly mangled merge.
Gabe Black [Wed, 8 Nov 2006 13:25:37 +0000 (08:25 -0500)]
Fix for slightly mangled merge.

--HG--
extra : convert_revision : 1dea04ca222dd423c3d462114bc1c65afa52825d

18 years agoMerge zeep.eecs.umich.edu:/home/gblack/m5/newmem
Gabe Black [Wed, 8 Nov 2006 13:19:52 +0000 (08:19 -0500)]
Merge zeep.eecs.umich.edu:/home/gblack/m5/newmem
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

src/arch/sparc/faults.hh:
    Hand merged.

--HG--
extra : convert_revision : 1bcefe47fa98e878a0dfbcfa5869b5b171927911

18 years agoMajor clean up of the fault code.
Gabe Black [Wed, 8 Nov 2006 13:12:19 +0000 (08:12 -0500)]
Major clean up of the fault code.

--HG--
extra : convert_revision : eb7e016a127417cbb0e1e2c733b17f82469c2f24

18 years agoThe new global level is computed with min, not max.
Gabe Black [Wed, 8 Nov 2006 09:18:15 +0000 (04:18 -0500)]
The new global level is computed with min, not max.

--HG--
extra : convert_revision : 6339c82d3655694445c3eb43e467b9aa6b4c8224

18 years agoChanged the getReg and setReg functions so that they work like netbsd. Apparently...
Gabe Black [Wed, 8 Nov 2006 07:13:47 +0000 (02:13 -0500)]
Changed the getReg and setReg functions so that they work like netbsd. Apparently, gdb expects to do single stepping on its own, so those functions panic for SPARC. acc still needs to be implemented.

--HG--
extra : convert_revision : c6e98e37b8ab3d6f8d6b3cd2c961faa65b08a179

18 years agoPut the ProcessInfo and StackTrace objects into the ISA namespaces.
Gabe Black [Wed, 8 Nov 2006 05:52:04 +0000 (00:52 -0500)]
Put the ProcessInfo and StackTrace objects into the ISA namespaces.

--HG--
extra : convert_revision : 1626703583f02a1c9823874290462c1b6bdb6c3c

18 years agoStubs for SPARC's tlbs
Gabe Black [Wed, 8 Nov 2006 05:32:40 +0000 (00:32 -0500)]
Stubs for SPARC's tlbs

--HG--
extra : convert_revision : ba08da78693cc6f59f7358134f121f471910dbf6

18 years agoReplaced getArg with a SPARC implementation.
Gabe Black [Wed, 8 Nov 2006 05:32:04 +0000 (00:32 -0500)]
Replaced getArg with a SPARC implementation.

--HG--
extra : convert_revision : ba31171a81b6c46de2997de2701d35fcf8c614b7

18 years agoForce remote gdb code to use signal numbers and not ISA specific trap numbers.
Gabe Black [Wed, 8 Nov 2006 04:40:54 +0000 (23:40 -0500)]
Force remote gdb code to use signal numbers and not ISA specific trap numbers.

--HG--
extra : convert_revision : 4f45a4b48e3993ac6991db2afffbce2e666eab6c

18 years agoFixed to account for branch delay slots.
Gabe Black [Wed, 8 Nov 2006 04:33:59 +0000 (23:33 -0500)]
Fixed to account for branch delay slots.

--HG--
extra : convert_revision : 36a91ad4ed56c61b6754548034a13c02cf580fc6