gem5.git
17 years agoFix insertBits so it doesn't shift things into oblivion
Gabe Black [Tue, 8 May 2007 17:19:33 +0000 (17:19 +0000)]
Fix insertBits so it doesn't shift things into oblivion

--HG--
extra : convert_revision : 8833b60e3fc94c917fbdb7a99f3d90155907b44e

17 years agoAdd a hack to truncate addresses to 32 bits in SE. Paging should be changed to use...
Gabe Black [Tue, 8 May 2007 13:02:19 +0000 (13:02 +0000)]
Add a hack to truncate addresses to 32 bits in SE. Paging should be changed to use the architecture's TLB, at which point this can be removed.

--HG--
extra : convert_revision : 54f3c18e5aead727d0ac244ed00fd97d3ca8ad75

17 years agousing remote
Gabe Black [Mon, 23 Apr 2007 16:30:03 +0000 (12:30 -0400)]
using remote

--HG--
extra : convert_revision : 5a174456b2e61ca6cfd126e92f477c948ba14b5e

17 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Gabe Black [Mon, 23 Apr 2007 16:28:11 +0000 (12:28 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : f4be014081396ae49c60a9a38ee2849d3b2b4ffd

17 years agoUpdate refs for CPU clock changes and O3 CPI/IPC calculation updates.
Kevin Lim [Mon, 23 Apr 2007 16:13:19 +0000 (12:13 -0400)]
Update refs for CPU clock changes and O3 CPI/IPC calculation updates.

tests/quick/00.hello/ref/mips/linux/simple-atomic/config.ini:
tests/quick/00.hello/ref/mips/linux/simple-atomic/config.out:
tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout:
tests/quick/00.hello/ref/mips/linux/simple-timing/config.ini:
tests/quick/00.hello/ref/mips/linux/simple-timing/config.out:
tests/quick/00.hello/ref/mips/linux/simple-timing/m5stats.txt:
tests/quick/00.hello/ref/mips/linux/simple-timing/stdout:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/config.ini:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/config.out:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout:
tests/quick/00.hello/ref/sparc/linux/simple-timing/config.ini:
tests/quick/00.hello/ref/sparc/linux/simple-timing/config.out:
tests/quick/00.hello/ref/sparc/linux/simple-timing/m5stats.txt:
tests/quick/00.hello/ref/sparc/linux/simple-timing/stdout:
tests/quick/02.insttest/ref/sparc/linux/o3-timing/config.ini:
tests/quick/02.insttest/ref/sparc/linux/o3-timing/config.out:
tests/quick/02.insttest/ref/sparc/linux/o3-timing/m5stats.txt:
tests/quick/02.insttest/ref/sparc/linux/o3-timing/stderr:
tests/quick/02.insttest/ref/sparc/linux/o3-timing/stdout:
tests/quick/02.insttest/ref/sparc/linux/simple-atomic/config.ini:
tests/quick/02.insttest/ref/sparc/linux/simple-atomic/config.out:
tests/quick/02.insttest/ref/sparc/linux/simple-atomic/m5stats.txt:
tests/quick/02.insttest/ref/sparc/linux/simple-atomic/stderr:
tests/quick/02.insttest/ref/sparc/linux/simple-atomic/stdout:
tests/quick/02.insttest/ref/sparc/linux/simple-timing/config.ini:
tests/quick/02.insttest/ref/sparc/linux/simple-timing/config.out:
tests/quick/02.insttest/ref/sparc/linux/simple-timing/m5stats.txt:
tests/quick/02.insttest/ref/sparc/linux/simple-timing/stderr:
tests/quick/02.insttest/ref/sparc/linux/simple-timing/stdout:
    Update refs.

--HG--
extra : convert_revision : 34a0d18f213386700e2acdd1eb9ebc5fa6daa7f5

17 years agoMerge zizzer.eecs.umich.edu:/n/wexford/x/gblack/m5/newmem-o3-spec
Gabe Black [Mon, 23 Apr 2007 15:34:40 +0000 (15:34 +0000)]
Merge zizzer.eecs.umich.edu:/n/wexford/x/gblack/m5/newmem-o3-spec
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-micro

--HG--
extra : convert_revision : 757e1d79033e6f8e0aaaf5ecaf14077d416cff8e

17 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Gabe Black [Mon, 23 Apr 2007 15:34:39 +0000 (11:34 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 12f10c174f0eca1ddf74b672414fbe78251f686b

17 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Sun, 22 Apr 2007 19:31:33 +0000 (15:31 -0400)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head

--HG--
extra : convert_revision : 05f738ab6cf1e8bd2940f4ce20602f1e8ad1af48

17 years agoChange mcf to use smred inputs so it doesn't take two days to run in o3.
Gabe Black [Sun, 22 Apr 2007 19:30:47 +0000 (19:30 +0000)]
Change mcf to use smred inputs so it doesn't take two days to run in o3.

--HG--
extra : convert_revision : 6bf58f5ea12afc56dff6237640fbeded58b9951e

17 years agoUpdated refs for calculating IPC/CPI.
Kevin Lim [Sun, 22 Apr 2007 19:29:59 +0000 (15:29 -0400)]
Updated refs for calculating IPC/CPI.

--HG--
extra : convert_revision : ee8dfee5eaa345dcb08f5d06d054655b1f6f79da

17 years agoUse proper cycles for IPC and CPI equations.
Kevin Lim [Sun, 22 Apr 2007 19:11:54 +0000 (15:11 -0400)]
Use proper cycles for IPC and CPI equations.

src/cpu/o3/cpu.cc:
    Use proper cycles for these equations.

--HG--
extra : convert_revision : cd49410eed978c789d788e80462abed6cb89fbae

17 years agoUpdate refs for new CPU frequency changes.
Kevin Lim [Sun, 22 Apr 2007 18:50:37 +0000 (14:50 -0400)]
Update refs for new CPU frequency changes.

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/m5stats.txt:
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-atomic/m5stats.txt:
tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr:
tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout:
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/linux/simple-timing/m5stats.txt:
tests/quick/00.hello/ref/alpha/linux/simple-timing/stderr:
tests/quick/00.hello/ref/alpha/linux/simple-timing/stdout:
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/m5stats.txt:
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-atomic/m5stats.txt:
tests/quick/00.hello/ref/alpha/tru64/simple-atomic/stderr:
tests/quick/00.hello/ref/alpha/tru64/simple-atomic/stdout:
tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.ini:
tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.out:
tests/quick/00.hello/ref/alpha/tru64/simple-timing/m5stats.txt:
tests/quick/00.hello/ref/alpha/tru64/simple-timing/stderr:
tests/quick/00.hello/ref/alpha/tru64/simple-timing/stdout:
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/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-atomic/m5stats.txt:
tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout:
tests/quick/50.memtest/ref/alpha/linux/memtest/config.ini:
tests/quick/50.memtest/ref/alpha/linux/memtest/config.out:
tests/quick/50.memtest/ref/alpha/linux/memtest/m5stats.txt:
tests/quick/50.memtest/ref/alpha/linux/memtest/stdout:
    Update refs

--HG--
extra : convert_revision : 8d9deb2b907843064b40e46207d9c9361941f022

17 years agoUpdate configs to set the CPU clock properly.
Kevin Lim [Sun, 22 Apr 2007 18:39:39 +0000 (14:39 -0400)]
Update configs to set the CPU clock properly.

--HG--
extra : convert_revision : 62fec666f987e9a9a441e319458908483cd2c5ff

17 years agoMake the floating point zero register special handling only apply for ALPHA.
Gabe Black [Sun, 22 Apr 2007 17:50:43 +0000 (17:50 +0000)]
Make the floating point zero register special handling only apply for ALPHA.

--HG--
extra : convert_revision : 4f393a5471656b29cecbacfcb337992239775915

17 years agoMake the GSR into a renamed control register. It should be split into a renamed part...
Gabe Black [Sun, 22 Apr 2007 17:43:45 +0000 (17:43 +0000)]
Make the GSR into a renamed control register. It should be split into a renamed part and a control part for the different bitfields, but the renamed part is all that's actually used.

--HG--
extra : convert_revision : ffeb4f874bd4430255064f6e8bcb135309932ff8

17 years agoMerge zizzer:/bk/newmem
Ali Saidi [Sat, 21 Apr 2007 23:12:13 +0000 (19:12 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/tmp/newmem

--HG--
extra : convert_revision : 8f173d3522e2e8847e51dfab48f35e34e6d3c1a7

17 years agofixes for solaris compile
Ali Saidi [Sat, 21 Apr 2007 23:11:38 +0000 (19:11 -0400)]
fixes for solaris compile

--HG--
extra : convert_revision : c82a62a61650e3700d237da917c453e5a9676320

17 years agocreate base/fenv.c to standerdize fenv across platforms. It's a c file and not a...
Ali Saidi [Sat, 21 Apr 2007 21:50:47 +0000 (17:50 -0400)]
create base/fenv.c to standerdize fenv across platforms. It's a c file and not a cpp file because c99
(which defines fenv) doesn't necessarily extend to c++ and it is a problem with solaris. If really
desired this could wrap the ieeefp interface found in bsd* as well, but I see no need at the moment.

src/arch/alpha/isa/fp.isa:
src/arch/sparc/isa/formats/basic.isa:
    use m5_fesetround()/m5_fegetround() istead of fenv interface directly
src/arch/sparc/isa/includes.isa:
    use base/fenv instead of fenv directly
src/base/SConscript:
    add fenv to sconscript
src/base/fenv.hh:
src/base/random.cc:
    m5 implementation to standerdize fenv across platforms.

--HG--
extra : convert_revision : 38d2629affd964dcd1a5ab0db4ac3cb21438e72c

17 years agospec-surge-client.rcS:
Lisa Hsu [Sat, 21 Apr 2007 00:21:59 +0000 (20:21 -0400)]
spec-surge-client.rcS:
fix script to reflect new benchmark directory sturcture

configs/boot/spec-surge-client.rcS:
    fix script to reflect new benchmark directory sturcture

--HG--
extra : convert_revision : 45f9d8aebabd1f3f8d1e826e07840e2365511a35

17 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Gabe Black [Thu, 19 Apr 2007 01:27:37 +0000 (21:27 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 26118d0dce464405148d2693fee4561fa0ce10ff

17 years agoupdate the stuff that's removed from the SConscripts
Nathan Binkert [Wed, 18 Apr 2007 23:56:06 +0000 (16:56 -0700)]
update the stuff that's removed from the SConscripts
since things have moved around a bit

--HG--
extra : convert_revision : 79322a65af6140d0c41aed0b381587eb05d72fd9

17 years agoMove the turbolaser python simobject stuff into the
Nathan Binkert [Wed, 18 Apr 2007 18:15:52 +0000 (11:15 -0700)]
Move the turbolaser python simobject stuff into the
encumbered directory

--HG--
extra : convert_revision : 7062ce81183b989f0d922b00d02433633474a854

17 years agofix SIGUSR1 and SIGUSR2 by clearing the variables after
Nathan Binkert [Wed, 18 Apr 2007 15:04:46 +0000 (08:04 -0700)]
fix SIGUSR1 and SIGUSR2 by clearing the variables after
they're used

--HG--
extra : convert_revision : ed5351f291d45d585bf811a062e162e16b86e886

17 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Gabe Black [Tue, 17 Apr 2007 12:56:59 +0000 (08:56 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : d18cce378fe3390c6e708945b9ea7c76c2d20a81

17 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Mon, 16 Apr 2007 02:40:18 +0000 (22:40 -0400)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head

--HG--
extra : convert_revision : fd9a2d0e833dd47f55aad9c50c68431bc6d3e0a7

17 years agoUpdate long test refs.
Kevin Lim [Mon, 16 Apr 2007 02:29:37 +0000 (22:29 -0400)]
Update long test refs.

tests/long/00.gzip/ref/alpha/tru64/o3-timing/config.ini:
tests/long/00.gzip/ref/alpha/tru64/o3-timing/config.out:
tests/long/00.gzip/ref/alpha/tru64/o3-timing/m5stats.txt:
tests/long/00.gzip/ref/alpha/tru64/o3-timing/stderr:
tests/long/30.eon/ref/alpha/tru64/o3-timing/config.ini:
tests/long/30.eon/ref/alpha/tru64/o3-timing/config.out:
tests/long/30.eon/ref/alpha/tru64/o3-timing/m5stats.txt:
tests/long/30.eon/ref/alpha/tru64/o3-timing/stderr:
tests/long/50.vortex/ref/alpha/tru64/o3-timing/config.ini:
tests/long/50.vortex/ref/alpha/tru64/o3-timing/config.out:
tests/long/50.vortex/ref/alpha/tru64/o3-timing/m5stats.txt:
tests/long/50.vortex/ref/alpha/tru64/o3-timing/stderr:
tests/long/60.bzip2/ref/alpha/tru64/o3-timing/config.ini:
tests/long/60.bzip2/ref/alpha/tru64/o3-timing/config.out:
tests/long/60.bzip2/ref/alpha/tru64/o3-timing/m5stats.txt:
tests/long/60.bzip2/ref/alpha/tru64/o3-timing/stderr:
tests/long/70.twolf/ref/alpha/tru64/o3-timing/config.ini:
tests/long/70.twolf/ref/alpha/tru64/o3-timing/config.out:
tests/long/70.twolf/ref/alpha/tru64/o3-timing/m5stats.txt:
tests/long/70.twolf/ref/alpha/tru64/o3-timing/smred.out:
tests/long/70.twolf/ref/alpha/tru64/o3-timing/stderr:
    Update refs.

--HG--
extra : convert_revision : 19483a5a18e76338a3208a58d7460a922377acd3

17 years agoMake an inner loop which pulls microops out of macroops. These aren't checked for...
Gabe Black [Sun, 15 Apr 2007 21:52:38 +0000 (21:52 +0000)]
Make an inner loop which pulls microops out of macroops. These aren't checked for control flow because we can pull out microops until we run out of buffer. This prevents microops from being interpretted as branches because the pc doesn't become npc.

--HG--
extra : convert_revision : 9fff7c6c32900692bbc567ecb75701c9c73da259

17 years agoAdd extra constructors to Alpha and MIPS
Gabe Black [Sun, 15 Apr 2007 21:51:05 +0000 (21:51 +0000)]
Add extra constructors to Alpha and MIPS

--HG--
extra : convert_revision : 26ea87bfe9e5c27134eb9a15bf9e4629afae6c69

17 years agoAdd support for microcode and pull out the special branch delay slot handling. Branch...
Gabe Black [Sat, 14 Apr 2007 17:13:18 +0000 (17:13 +0000)]
Add support for microcode and pull out the special branch delay slot handling. Branch delay slots need to be squash on a mispredict as well because the nnpc they saw was incorrect.

--HG--
extra : convert_revision : 8b9c603616bcad254417a7a3fa3edfb4c8728719

17 years agoMake register indexes larger so they can actually hold all the legal values. Oops!
Gabe Black [Sat, 14 Apr 2007 17:08:24 +0000 (17:08 +0000)]
Make register indexes larger so they can actually hold all the legal values. Oops!

--HG--
extra : convert_revision : 7689b2e1f7468e4acb8be0f242f74002c79e7960

17 years agoMake the fsr a serializing register. Other control registers probably need this as...
Gabe Black [Sat, 14 Apr 2007 17:07:24 +0000 (17:07 +0000)]
Make the fsr a serializing register. Other control registers probably need this as well.

--HG--
extra : convert_revision : edd3f9a83cc2722b6e0eff0eff4a8e034b0f6ec6

17 years agoMerge zizzer:/bk/newmem
Ali Saidi [Fri, 13 Apr 2007 17:34:04 +0000 (13:34 -0400)]
Merge zizzer:/bk/newmem
into  udhcp-macvpn-501.public.engin.umich.edu:/Users/ali/work/m5.newmem

--HG--
extra : convert_revision : 38c2427790d27c64e69ac3223e76cabeeb765904

17 years agotake a first stab at the release notes
Ali Saidi [Fri, 13 Apr 2007 17:33:32 +0000 (13:33 -0400)]
take a first stab at the release notes

AUTHORS:
    add sparc full system support to my list of accolades

--HG--
extra : convert_revision : 1d3afaae2502306e44cd7fb251e763931a7e3ae9

17 years agoAdjust references to reflect differences without special delay slot handling. Perform...
Gabe Black [Fri, 13 Apr 2007 14:00:42 +0000 (14:00 +0000)]
Adjust references to reflect differences without special delay slot handling. Performance actually went up slightly.

--HG--
extra : convert_revision : 504f6185ddc89881aa41deb7fd934da8038d1ed2

17 years agoRemove most of the special handling for delay slots since they have to be squashed...
Gabe Black [Fri, 13 Apr 2007 13:59:31 +0000 (13:59 +0000)]
Remove most of the special handling for delay slots since they have to be squashed anyway on a mispredict. This is because the NNPC value they saw when executing was incorrect.

--HG--
extra : convert_revision : b42c4eb28b4fbba66c65cbd0a5033bf886c1532d

17 years agoCompletely re-work how the scons framework incorporates swig
Nathan Binkert [Fri, 13 Apr 2007 04:20:04 +0000 (21:20 -0700)]
Completely re-work how the scons framework incorporates swig
and python code into m5 to allow swig an python code to
easily added by any SConscript instead of just the one in
src/python.  This provides SwigSource and PySource for
adding new files to m5 (similar to Source for C++).  Also
provides SimObject for including files that contain SimObject
information and build the m5.objects __init__.py file.

--HG--
extra : convert_revision : 38b50a0629846ef451ed02f96fe3633947df23eb

17 years agoDon't allow Source to accept multiple arguments, lists,
Nathan Binkert [Thu, 12 Apr 2007 16:07:59 +0000 (09:07 -0700)]
Don't allow Source to accept multiple arguments, lists,
or automatically do Split().  It isn't used anywhere, and
isn't very consistent with the python features that are
about to be added.  Do accept SCons.Node.FS.File arguments
though.

--HG--
extra : convert_revision : 0f3bb0e9e6806490330eea59a104013042b4dd49

17 years agoFix NextEthernetAddr.
Nathan Binkert [Thu, 12 Apr 2007 15:37:55 +0000 (08:37 -0700)]
Fix NextEthernetAddr.
unproxy() needs to return a new object otherwise all
instances will use the same value.  This fix is more
or less unique to NextEthernetAddr because its use of
the proxy stuff is a bit different than everything else.

--HG--
extra : convert_revision : 2ce452e37d00b9ba76b6abfaec0ad2e0073920d7

17 years agoAdd a scons hack to force symlinks to the swig .i files
Nathan Binkert [Thu, 12 Apr 2007 15:35:19 +0000 (08:35 -0700)]
Add a scons hack to force symlinks to the swig .i files
to be created

--HG--
extra : convert_revision : 826cc692614528f987c80c3410cb025190f0a4e0

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Wed, 11 Apr 2007 15:30:09 +0000 (15:30 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 50102b96ba07b2b132d649a111268ee1f08c2147

17 years agoMake trying to execute macroops fail with a better error message.
Gabe Black [Wed, 11 Apr 2007 12:26:23 +0000 (12:26 +0000)]
Make trying to execute macroops fail with a better error message.

--HG--
extra : convert_revision : e81c0337d6db4b5a33381ed19686750bbb9d9178

17 years agoCreate a filter and a union to translate the SPARC instruction implementations from...
Gabe Black [Wed, 11 Apr 2007 12:25:00 +0000 (12:25 +0000)]
Create a filter and a union to translate the SPARC instruction implementations from using doubles to using concatenated singles.

--HG--
extra : convert_revision : 609ba35bbb13cbd1998e93957cb051461442d1f9

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Tue, 10 Apr 2007 17:27:33 +0000 (17:27 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : c5275ef3e53393496a2ebe05b2f516884bb392f9

17 years agoEven if you don't want to fetch more bytes, make sure you handle a fault.
Gabe Black [Tue, 10 Apr 2007 17:27:12 +0000 (17:27 +0000)]
Even if you don't want to fetch more bytes, make sure you handle a fault.

--HG--
extra : convert_revision : cfebc877b9b2ebc8927ce8267867eb40ad6d59c6

17 years agoInclude the new GenFault microop.
Gabe Black [Tue, 10 Apr 2007 17:26:04 +0000 (17:26 +0000)]
Include the new GenFault microop.

--HG--
extra : convert_revision : 6c943329525d2a01f35ad5e56ff91505d5011d7b

17 years agoReworked x86 a bit
Gabe Black [Tue, 10 Apr 2007 17:25:15 +0000 (17:25 +0000)]
Reworked x86 a bit

--HG--
extra : convert_revision : def1a30e54b59c718c451a631a1be6f8e787e843

17 years agoUpdated for the new instruction stubs.
Gabe Black [Tue, 10 Apr 2007 17:23:47 +0000 (17:23 +0000)]
Updated for the new instruction stubs.

--HG--
extra : convert_revision : c85799c9093d8e9efba0744c8768196879974b74

17 years agoChanged some instruction names to be in all caps, and "implemented" move to test...
Gabe Black [Tue, 10 Apr 2007 17:22:45 +0000 (17:22 +0000)]
Changed some instruction names to be in all caps, and "implemented" move to test the stub code for instructions.

--HG--
extra : convert_revision : a377daf20545dfcbb0f97d8cafbe3d68416dc4b2

17 years agoAdded stub implementations of the x86 instructions categorized like they are in the...
Gabe Black [Tue, 10 Apr 2007 17:18:59 +0000 (17:18 +0000)]
Added stub implementations of the x86 instructions categorized like they are in the AMD64 manuals' instruction summary in volume 1.

--HG--
extra : convert_revision : 47b1d9aa0c88f6832f14ab68df174263d0d1eda9

17 years agoA new microop which generates a specified fault.
Gabe Black [Tue, 10 Apr 2007 17:16:22 +0000 (17:16 +0000)]
A new microop which generates a specified fault.

--HG--
extra : convert_revision : c5c59f82553ffae273c95ea777e21e85648a4f98

17 years agoAdded a class which lets you manipulate all the strings returned by the parser as...
Gabe Black [Tue, 10 Apr 2007 17:14:51 +0000 (17:14 +0000)]
Added a class which lets you manipulate all the strings returned by the parser as a unit.

--HG--
extra : convert_revision : eec4b188b44b80cee643542bbd1aaa139cbc4ef0

17 years agoFix up the base x86 fault object and create a fault to be generated by unimplemented...
Gabe Black [Tue, 10 Apr 2007 17:13:26 +0000 (17:13 +0000)]
Fix up the base x86 fault object and create a fault to be generated by unimplemented instructions in their microcode. This is useful if certain variations of an instruction are implemented, but, for instance, it's memory based versions aren't.

--HG--
extra : convert_revision : 24e69c5a6a0af2d0cf67e858a051ae6624bb300f

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Tue, 10 Apr 2007 01:53:04 +0000 (01:53 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 247fc298ba8ea1ea38ee2e906aa84bb5bc3f4592

17 years agoFixed a compile error.
Gabe Black [Tue, 10 Apr 2007 01:52:38 +0000 (01:52 +0000)]
Fixed a compile error.

--HG--
extra : convert_revision : 70221349a7100c89be0d03210f3b04950370583f

17 years agoadd code to whack the intel gbe model from the relase.... it's not tested and it...
Ali Saidi [Mon, 9 Apr 2007 22:49:02 +0000 (18:49 -0400)]
add code to whack the intel gbe model from the relase.... it's not tested and it's configuration is a hack

--HG--
extra : convert_revision : b65cd6d9b45a67ba64ea398cf0c0ce28f91c7e27

17 years agoComment out the remote gdb object for SE mode.
Gabe Black [Mon, 9 Apr 2007 18:30:50 +0000 (18:30 +0000)]
Comment out the remote gdb object for SE mode.

--HG--
extra : convert_revision : a582684f3a2dd1d1d0d8b93a9e213d9108491535

17 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Mon, 9 Apr 2007 18:30:49 +0000 (14:30 -0400)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head

--HG--
extra : convert_revision : a250eed999be9b8acd6f420fdfe8f1b02905beb1

17 years agoFix bug when blocking due to no free registers.
Kevin Lim [Mon, 9 Apr 2007 18:29:59 +0000 (14:29 -0400)]
Fix bug when blocking due to no free registers.

--HG--
extra : convert_revision : a1a218d3294515184689041487057495223360b7

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Mon, 9 Apr 2007 07:59:57 +0000 (07:59 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 1396ed5b264d29377ef9793a763225a93181f65f

17 years agoAdded SPARC o3 insttest regression.
Gabe Black [Mon, 9 Apr 2007 07:59:56 +0000 (03:59 -0400)]
Added SPARC o3 insttest regression.

--HG--
extra : convert_revision : b008b4bda60ced329df9b700ff9b0a978e2d3b19

17 years agoAdded SPARC simple timing regression for insttest
Gabe Black [Mon, 9 Apr 2007 07:52:15 +0000 (03:52 -0400)]
Added SPARC simple timing regression for insttest

--HG--
extra : convert_revision : cb490fd6f1be73b57dceb93edf83d7edc4a67beb

17 years agoMake SPARC build o3 by default.
Gabe Black [Mon, 9 Apr 2007 07:40:21 +0000 (03:40 -0400)]
Make SPARC build o3 by default.

--HG--
extra : convert_revision : 7be49f9d395094d849d8da59b0fd4efe962fb201

17 years agoAccidentally didn't save when moving the specialization code out of here.
Gabe Black [Mon, 9 Apr 2007 01:08:05 +0000 (01:08 +0000)]
Accidentally didn't save when moving the specialization code out of here.

--HG--
extra : convert_revision : 1ffe0c497e10fef1eb84b3c97c00b98d820fbb97

17 years agoTake into account that the flattened integer register space is a different size than...
Gabe Black [Sun, 8 Apr 2007 23:31:11 +0000 (23:31 +0000)]
Take into account that the flattened integer register space is a different size than the architected one. Also fixed some asserts.

--HG--
extra : convert_revision : 26e7863919d1b976ba8cad747af475a6f18e9440

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Sun, 8 Apr 2007 01:54:08 +0000 (01:54 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : dba3542ab73cc8ae46347a14ae4c133f1276011c

17 years agoGet the "hard" SPARC instructions working in o3. I don't like that the IsStoreConditi...
Gabe Black [Sun, 8 Apr 2007 01:42:42 +0000 (01:42 +0000)]
Get the "hard" SPARC instructions working in o3. I don't like that the IsStoreConditional flag needs to be set for them because they aren't store conditional instructions, and I should fix the format code which is not handling the opt_flags correctly.

--HG--
extra : convert_revision : cfd32808592832d7b6fbdaace5ae7b17c8a246e9

17 years agoMove the instruction specialization stuff out of the microassembler file, and added...
Gabe Black [Fri, 6 Apr 2007 16:55:56 +0000 (16:55 +0000)]
Move the instruction specialization stuff out of the microassembler file, and added some comments to main.isa

--HG--
extra : convert_revision : 1534ae7d5a9e95bf662d79a04f9286c227541c6c

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Fri, 6 Apr 2007 16:39:47 +0000 (16:39 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 8e624bb95cb9f478ca7ac1dbbd64e20674e3e224

17 years agoConsolidated the microcode assembler to help separate it from more x86-centric stuff.
Gabe Black [Fri, 6 Apr 2007 16:39:25 +0000 (16:39 +0000)]
Consolidated the microcode assembler to help separate it from more x86-centric stuff.

--HG--
extra : convert_revision : 5e7e8026e24ce44a3dac4a358e0c3e5560685958

17 years agoRefactored the x86 isa description some more. There should be more seperation between...
Gabe Black [Fri, 6 Apr 2007 16:00:56 +0000 (16:00 +0000)]
Refactored the x86 isa description some more. There should be more seperation between x86 specific parts, and those parts which are implemented in the isa description but could eventually be moved elsewhere.

--HG--
rename : src/arch/x86/isa/formats/macroop.isa => src/arch/x86/isa/macroop.isa
extra : convert_revision : 5ab40eedf574fce438d9fe90e00a496dc95c8bcf

17 years agoClean up the code a little, fix (I think) a perceived problem with immediate sizes...
Gabe Black [Fri, 6 Apr 2007 15:19:23 +0000 (15:19 +0000)]
Clean up the code a little, fix (I think) a perceived problem with immediate sizes, and sign extend the 32-bit-acting-like-64-bit-immediates.

--HG--
extra : convert_revision : e59b747198cc79d50045bd2dc45b2e2b97bbffcc

17 years agoAdd in a stub merging function
Gabe Black [Fri, 6 Apr 2007 15:16:36 +0000 (15:16 +0000)]
Add in a stub merging function

--HG--
extra : convert_revision : 15e3cdb4ebcd31bc44204687ba59dde00c56c6be

17 years agoClean up the macroop code.
Gabe Black [Fri, 6 Apr 2007 15:15:36 +0000 (15:15 +0000)]
Clean up the macroop code.

--HG--
extra : convert_revision : 3cf83c3e038fece6190dbb91f56deb0498c9a70d

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Fri, 6 Apr 2007 14:37:46 +0000 (14:37 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : b7e89d32df946ea24c438292308f5fc8248f8bd9

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Thu, 5 Apr 2007 11:35:31 +0000 (11:35 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : efdbf9787383dc1df544b7276f8120285e69bf69

17 years agoThe process of going from an instruction definition to an instruction to be returned...
Gabe Black [Wed, 4 Apr 2007 23:35:20 +0000 (23:35 +0000)]
The process of going from an instruction definition to an instruction to be returned by the decoder has been fleshed out more. The following steps describe how an instruction implementation becomes a StaticInst.

1. Microops are created. These are StaticInsts use templates to provide a basic form of polymorphism without having to make the microassembler smarter.
2. An instruction class is created which has a "templated" microcode program as it's docstring. The template parameters are refernced with ^ following by a number.
3. An instruction in the decoder references an instruction template using it's mnemonic. The parameters to it's format end up replacing the placeholders. These parameters describe a source for an operand which could be memory, a register, or an immediate. It it's a register, the register index is used. If it's memory, eventually a load/store will be pre/postpended to the instruction template and it's destination register will be used in place of the ^. If it's an immediate, the immediate is used. Some operand types, specifically those that come from the ModRM byte, need to be decoded further into memory vs. register versions. This is accomplished by making the decode_block text for these instructions another case statement based off ModRM.
4. Once all of the template parameters have been handled, the instruction goes throw the microcode assembler which resolves labels and creates a list of python op objects. If an operand is a register, it uses a % prefix, an immediate uses $, and a label uses @. If the operand is just letters, numbers, and underscores, it can appear immediately after the prefix. If it's not, it can be encolsed in non nested {}s.
5. If there is a single "op" object (which corresponds to a single microop) the decoder is set up to return it directly. If not, a macroop wrapper is created around it.

In the future, I'm considering seperating the operand type specialization from the template substitution step. A problem this introduces is that either the template arguments need to be kept around for the specialization step, or they need to be re-extracted. Re-extraction might be the way to go so that the operand formats can be coded directly into the micro assembler template without having to pass them in as parameters. I don't know if that's actually useful, though.

src/arch/x86/isa/decoder/one_byte_opcodes.isa:
src/arch/x86/isa/microasm.isa:
src/arch/x86/isa/microops/microops.isa:
src/arch/x86/isa/operands.isa:
src/arch/x86/isa/microops/base.isa:
    Implemented polymorphic microops and changed around the microcode assembler syntax.

--HG--
extra : convert_revision : e341f7b8ea9350a31e586a3d33250137e5954f43

17 years agoFix a regular expression problem when recognizing labels for string substitution.
Gabe Black [Wed, 4 Apr 2007 23:19:32 +0000 (23:19 +0000)]
Fix a regular expression problem when recognizing labels for string substitution.

--HG--
extra : convert_revision : ba398e1b434efda28882f159d5a4419302276371

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Wed, 4 Apr 2007 20:50:49 +0000 (20:50 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 81269f094834f43b4e908321bfce2e031b39d2a4

17 years agoUpdates for other ISA cpu_builders.
Kevin Lim [Wed, 4 Apr 2007 20:50:48 +0000 (16:50 -0400)]
Updates for other ISA cpu_builders.

--HG--
extra : convert_revision : b02736c627bb9dcf87463a9133e04369b9f8fae2

17 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Wed, 4 Apr 2007 19:39:13 +0000 (15:39 -0400)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head

--HG--
extra : convert_revision : 7181d8c2ee673322372484cf288a94ebd91b5265

17 years agoPass ISA-specific O3 CPU as a constructor parameter instead of using setCPU functions.
Kevin Lim [Wed, 4 Apr 2007 19:38:59 +0000 (15:38 -0400)]
Pass ISA-specific O3 CPU as a constructor parameter instead of using setCPU functions.

src/cpu/o3/alpha/cpu_impl.hh:
    Pass ISA-specific O3 CPU to FullO3CPU as a constructor parameter instead of using setCPU functions.

--HG--
extra : convert_revision : 74f4b1f5fb6f95a56081f367cce7ff44acb5688a

17 years agoMerge zizzer:/bk/newmem
Ali Saidi [Wed, 4 Apr 2007 17:57:23 +0000 (13:57 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : be37463ea3ca38ef02ae0b82da0752f240a530d0

17 years agoThe MemoryObject tha owns a port should delete it if it so chooses when deletePortRef...
Ali Saidi [Wed, 4 Apr 2007 17:56:38 +0000 (13:56 -0400)]
The MemoryObject tha owns a port should delete it if it so chooses when deletePortRefs() is called on it with that port as a parameter.
In this way a MemoryObject can keep a functional port around and give it to anyone who wants to do functional accesses rather
than creating a new one each time.

src/mem/bus.cc:
src/mem/bus.hh:
src/mem/cache/cache_impl.hh:
    only keep around one func port we give to anyone who wants it. Otherwise we can run out of port ids reasonably quickly if
    a lot of functional accesses are happening (e.g. remote debugging, dprintk, etc)

--HG--
extra : convert_revision : 6a9e3e96f51cedaab6de1b36cf317203899a3716

17 years agoReworking how x86's isa description works. I'm adopting the following definitions...
Gabe Black [Wed, 4 Apr 2007 14:31:59 +0000 (14:31 +0000)]
Reworking how x86's isa description works. I'm adopting the following definitions to make figuring out what's what a little easier:

MicroOp: A single operation actually implemented in hardware.
MacroOp: A collection of microops which are executed as a unit.
Instruction: An architected instruction which can be implemented with a macroop or a microop.

--HG--
extra : convert_revision : 1cfc8409cc686c75220767839f55a30551aa6f13

17 years agoMake "Name" really be the same as "name" with only the first letter capitalized....
Gabe Black [Wed, 4 Apr 2007 14:28:43 +0000 (14:28 +0000)]
Make "Name" really be the same as "name" with only the first letter capitalized. Before, it had the first letter capitalized but all the others lower case

--HG--
extra : convert_revision : bcbb28f2bf268765c1d37075a4417a4a6c1b9588

17 years agoMade x86 ExtMachInsts distinguishable from each other by defining a real == and a...
Gabe Black [Wed, 4 Apr 2007 14:27:00 +0000 (14:27 +0000)]
Made x86 ExtMachInsts distinguishable from each other by defining a real == and a real hash function.

--HG--
extra : convert_revision : 30f29a36f6ab44e67e62aaf81b685fbe1267c746

17 years agoAdded all the different variations of the register names.
Gabe Black [Wed, 4 Apr 2007 14:25:36 +0000 (14:25 +0000)]
Added all the different variations of the register names.

--HG--
extra : convert_revision : ff06bdca556a5e1a0dfe7978575c2277c30c002a

17 years agoMerge ktlim@zizzer:/bk/newmem
Kevin Lim [Wed, 4 Apr 2007 04:14:44 +0000 (00:14 -0400)]
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head

--HG--
extra : convert_revision : 4a8cbb65b19636c31b5c6fd5f24c90f8f2148ed1

17 years agoMade the "data" field of store queue entries into a character array. It's sized to...
Gabe Black [Tue, 3 Apr 2007 22:53:26 +0000 (22:53 +0000)]
Made the "data" field of store queue entries into a character array. It's sized to match an IntReg which was what it used to be, but we might want to make it something architecture independent. All data is now endian converted before entering the store queue entries which simplifies store to load forwarding in "trans endian" simulations, and makes twin memory ops work.

src/cpu/o3/lsq_unit.hh:
src/cpu/o3/lsq_unit_impl.hh:
    fixed twin memory operations.

--HG--
extra : convert_revision : 8fb97f98e285cd22413e06e146fa82392ac2a590

17 years agoMerge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
Ali Saidi [Tue, 3 Apr 2007 22:29:09 +0000 (18:29 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into  zizzer.eecs.umich.edu:/tmp/newmem.1449b

--HG--
extra : convert_revision : 05021f4884de7af769df9f9c4416c483baa9c2fe

17 years agofixed sttw instruction changes execution trace a bit
Ali Saidi [Tue, 3 Apr 2007 22:28:59 +0000 (18:28 -0400)]
fixed sttw instruction changes execution trace a bit

--HG--
extra : convert_revision : 4bebe6f9acedfd29dfe02f16d4ddb551a2fc7290

17 years agoFix a memory leak. Hopefully this fixes the longer running benchmarks.
Kevin Lim [Tue, 3 Apr 2007 18:25:24 +0000 (14:25 -0400)]
Fix a memory leak.  Hopefully this fixes the longer running benchmarks.

--HG--
extra : convert_revision : 89eff82642ff181a9b95c77c4d2bf620ca837113

17 years agoMerge zizzer.eecs.umich.edu:/bk/newmem
Gabe Black [Tue, 3 Apr 2007 15:01:36 +0000 (15:01 +0000)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : 7be8ebe55a7b11552d78701520f93aa86db1e501

17 years agoA batch of changes and fixes. Macroops are now generated automatically, multiops...
Gabe Black [Tue, 3 Apr 2007 15:01:09 +0000 (15:01 +0000)]
A batch of changes and fixes. Macroops are now generated automatically, multiops do alot more of what they're supposed to (excluding memory operands), and microops are slightly more implemented.

--HG--
extra : convert_revision : 518059f47e11df50aa450d4a322ef2ac069c99c9

17 years agoZero out ModRM if the byte isn't there, and fix some displacement size stuff.
Gabe Black [Tue, 3 Apr 2007 14:56:24 +0000 (14:56 +0000)]
Zero out ModRM if the byte isn't there, and fix some displacement size stuff.

--HG--
extra : convert_revision : f43abf33a223a665b30098c63011fb162200d5e6

17 years agoRemove/comment out DPRINTFs that were causing a segfault.
Kevin Lim [Mon, 2 Apr 2007 17:55:45 +0000 (13:55 -0400)]
Remove/comment out DPRINTFs that were causing a segfault.

The removed ones were unnecessary.  The commented out ones could be useful in the future, should this problem get fixed.  See flyspray task #243.

src/cpu/o3/commit_impl.hh:
src/cpu/o3/decode_impl.hh:
src/cpu/o3/fetch_impl.hh:
src/cpu/o3/iew_impl.hh:
src/cpu/o3/inst_queue_impl.hh:
src/cpu/o3/lsq_impl.hh:
src/cpu/o3/lsq_unit_impl.hh:
src/cpu/o3/rename_impl.hh:
src/cpu/o3/rob_impl.hh:
    Remove/comment out DPRINTFs that were causing a segfault.

--HG--
extra : convert_revision : b5aeda1c6300dfde5e0a3e9b8c4c5f6fa00b9862

17 years agoFix up SPARC's CPU builder to match changes to Alpha's CPU builder.
Kevin Lim [Mon, 2 Apr 2007 17:28:17 +0000 (13:28 -0400)]
Fix up SPARC's CPU builder to match changes to Alpha's CPU builder.

--HG--
extra : convert_revision : ec2a739f1da07f0922c772e6998017995115ce80

17 years agoUpdate refs for recent changes.
Kevin Lim [Fri, 30 Mar 2007 20:59:40 +0000 (16:59 -0400)]
Update refs for recent changes.

--HG--
extra : convert_revision : 30a02eec4d83c4e1708ed0a4e2b5faea88fe8e03

17 years agoMerge zizzer:/bk/newmem
Ali Saidi [Fri, 30 Mar 2007 02:01:34 +0000 (22:01 -0400)]
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 2f7f50f4ad31f741c0c67db96e49d30ca078fc94

17 years agomake serialization at least seem to work
Ali Saidi [Fri, 30 Mar 2007 02:00:01 +0000 (22:00 -0400)]
make serialization at least seem to work

--HG--
extra : convert_revision : cbfdb64f9a204670b8dd0294c74a17044b9f330c