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
Gabe Black [Wed, 8 Nov 2006 13:25:37 +0000 (08:25 -0500)]
Fix for slightly mangled merge.
--HG--
extra : convert_revision :
1dea04ca222dd423c3d462114bc1c65afa52825d
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
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
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
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
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
Gabe Black [Wed, 8 Nov 2006 05:32:40 +0000 (00:32 -0500)]
Stubs for SPARC's tlbs
--HG--
extra : convert_revision :
ba08da78693cc6f59f7358134f121f471910dbf6
Gabe Black [Wed, 8 Nov 2006 05:32:04 +0000 (00:32 -0500)]
Replaced getArg with a SPARC implementation.
--HG--
extra : convert_revision :
ba31171a81b6c46de2997de2701d35fcf8c614b7
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
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
Gabe Black [Wed, 8 Nov 2006 03:34:34 +0000 (22:34 -0500)]
Put kernel_stats back into arch.
--HG--
rename : src/kern/alpha/idle_event.cc => src/arch/alpha/idle_event.cc
rename : src/kern/alpha/idle_event.hh => src/arch/alpha/idle_event.hh
rename : src/kern/alpha/kernel_stats.cc => src/arch/alpha/kernel_stats.cc
rename : src/kern/alpha/kernel_stats.hh => src/arch/alpha/kernel_stats.hh
rename : src/kern/sparc/kernel_stats.hh => src/arch/sparc/kernel_stats.hh
rename : src/kern/base_kernel_stats.cc => src/kern/kernel_stats.cc
rename : src/kern/base_kernel_stats.hh => src/kern/kernel_stats.hh
extra : convert_revision :
42bd3e36b407edbd19b912c9218f4e5923a15966
Gabe Black [Wed, 8 Nov 2006 01:35:43 +0000 (20:35 -0500)]
Merge 141.212.106.238:/home/gblack/m5/newmemmemops
into zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmemmemops
--HG--
extra : convert_revision :
2d498496b5df97f94479ea01cc8306c24dac3dbb
Gabe Black [Wed, 8 Nov 2006 01:35:42 +0000 (20:35 -0500)]
A cleaner hack.
--HG--
extra : convert_revision :
8992af33f2779a8d9dc357e648ba39005d0c971a
Gabe Black [Wed, 8 Nov 2006 01:26:45 +0000 (20:26 -0500)]
Only include kern/kernel_stats.hh if in full system. This was breaking MIPS_SE
--HG--
extra : convert_revision :
b3f956af92cb98b4945aebc8aece1dffcabdf15c
Gabe Black [Tue, 7 Nov 2006 10:47:10 +0000 (05:47 -0500)]
Definition of stub kernel_stats object. This just uses the base object.
--HG--
extra : convert_revision :
349b6743b82eef4fe46b04f10b5adfa8adfb6a0e
Gabe Black [Tue, 7 Nov 2006 10:46:15 +0000 (05:46 -0500)]
Alpha derived classes for kernel_stats.
--HG--
extra : convert_revision :
93b2c6f6687b21c84b97a7665cd9fc04c59ba9d6
Gabe Black [Tue, 7 Nov 2006 10:45:12 +0000 (05:45 -0500)]
SConscripts for the architecture specific directories in kern.
--HG--
extra : convert_revision :
d1ca26c7933a006946372978deeae840595688c7
Gabe Black [Tue, 7 Nov 2006 10:44:22 +0000 (05:44 -0500)]
A dummy implementation of stacktrace.cc to clear up linker errors.
--HG--
extra : convert_revision :
ea1e54a529ad7ae4a6564dd6fb47c31fb0573adf
Gabe Black [Tue, 7 Nov 2006 10:43:33 +0000 (05:43 -0500)]
Arguments class for SPARC. This is basically just a copy of Alpha's
--HG--
extra : convert_revision :
9df68973c63d5ff256d6de485e8d918c454c8ff1
Gabe Black [Tue, 7 Nov 2006 10:42:52 +0000 (05:42 -0500)]
Removed unnecessary arch/alpha/ev5.hh include
--HG--
extra : convert_revision :
e8277cc279be839c1754b5da96f9153da06d3ec1
Gabe Black [Tue, 7 Nov 2006 10:42:15 +0000 (05:42 -0500)]
Added sim/host.hh for the Addr type.
--HG--
extra : convert_revision :
cd07a920417b7fb34e5ca3bf70d707327eb59eb3
Gabe Black [Tue, 7 Nov 2006 10:41:51 +0000 (05:41 -0500)]
Got rid of a stray blank line.
--HG--
extra : convert_revision :
7b58f75e5efc3c9ead2434f87605cbabcb23d90a
Gabe Black [Tue, 7 Nov 2006 10:41:23 +0000 (05:41 -0500)]
Added a stub implementation of fixFuncEventAddr to get past linker errors.
--HG--
extra : convert_revision :
24ab1789496c5fae6c0992db2d521ea02354ee90
Gabe Black [Tue, 7 Nov 2006 10:40:48 +0000 (05:40 -0500)]
The normal spill and fill faults only need to behave specially in SE.
--HG--
extra : convert_revision :
4d4b866699e3450b88418822fc198411ee3d831a
Gabe Black [Tue, 7 Nov 2006 10:40:06 +0000 (05:40 -0500)]
Added in alot of missing source files.
--HG--
extra : convert_revision :
335b458d195a00dac3d04e92fe9df915e660538f
Gabe Black [Tue, 7 Nov 2006 10:39:40 +0000 (05:39 -0500)]
Broke remote_gdb into a base class and architecture specific derived classes.
--HG--
extra : convert_revision :
8c528fab56a95b8245ad0f2572d62bb556ce0dde
Gabe Black [Tue, 7 Nov 2006 10:38:33 +0000 (05:38 -0500)]
Moved the idle event out of system_events.hh. The skipFuncEvent can be made ISA independent by making it use the #define for branch delay slots (and NNPC)
--HG--
extra : convert_revision :
b2631b1163397ecc99f2f315e2b88537e2002731
Gabe Black [Tue, 7 Nov 2006 10:36:54 +0000 (05:36 -0500)]
Moved the switched version of kernel_stats.hh back to kern, and moved the base kernel_stats to base_kernel_stats
--HG--
extra : convert_revision :
2a010d2eb7ea2586ff063b99b8bcde6eb1e8e017
Gabe Black [Tue, 7 Nov 2006 10:34:14 +0000 (05:34 -0500)]
Missed this file in my last changeset.
--HG--
extra : convert_revision :
94affbcfb5e5fd948010b10d481627a4dd500267
Gabe Black [Tue, 7 Nov 2006 10:33:21 +0000 (05:33 -0500)]
Made kern a switching header file directory.
SConstruct:
Put the code to make a switching header directory into a function so they are easy to make.
src/arch/SConscript:
Replace switching header code with the new function call.
src/kern/SConscript:
Created a new switching header directory in kern, and moved the declaration of some source files here.
--HG--
rename : src/kern/kernel_stats.cc => src/kern/base_kernel_stats.cc
rename : src/kern/kernel_stats.hh => src/kern/base_kernel_stats.hh
extra : convert_revision :
98f5320a5ade567c3e4f67fef123dfb0c5122545
Gabe Black [Tue, 7 Nov 2006 01:49:48 +0000 (20:49 -0500)]
Cleaned up remnants of ivlb and ivle
--HG--
extra : convert_revision :
93b37dbcd3d9dd1eced0f829223f52b53fe58643
Gabe Black [Tue, 7 Nov 2006 01:07:44 +0000 (20:07 -0500)]
Got rid of the ivlb and ivle kernel stats.
--HG--
extra : convert_revision :
d85627bb3eafe6411355995a92ba8b151be8320d
Gabe Black [Tue, 7 Nov 2006 00:56:57 +0000 (19:56 -0500)]
Get rid of pcifake.cc and tsunami_fake.cc to go with the merged default devices.
--HG--
extra : convert_revision :
e88aaaa43843c1283f29cef0886e057412705899
Gabe Black [Tue, 7 Nov 2006 00:55:42 +0000 (19:55 -0500)]
Only bother with the device SConscript if you're in FULL_SYSTEM
--HG--
extra : convert_revision :
ac52f548afb98dd0437e7d7c2600ff9b8ebfd1fa
Gabe Black [Tue, 7 Nov 2006 00:52:32 +0000 (19:52 -0500)]
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
src/SConscript:
SCCS merged
--HG--
extra : convert_revision :
f130c8a2d33f58d857e5d5a02bb9698c1bceb23b
Gabe Black [Tue, 7 Nov 2006 00:45:00 +0000 (19:45 -0500)]
Moved the tsunami devices into the dev/alpha directory. Other devices "generic" devices are dependent on some of those files. That will either need to change, or most likely those devices will have to be considered architecture dependent.
--HG--
rename : src/dev/tsunami.cc => src/dev/alpha/tsunami.cc
rename : src/dev/tsunami.hh => src/dev/alpha/tsunami.hh
rename : src/dev/tsunami_cchip.cc => src/dev/alpha/tsunami_cchip.cc
rename : src/dev/tsunami_cchip.hh => src/dev/alpha/tsunami_cchip.hh
rename : src/dev/tsunami_io.cc => src/dev/alpha/tsunami_io.cc
rename : src/dev/tsunami_io.hh => src/dev/alpha/tsunami_io.hh
rename : src/dev/tsunami_pchip.cc => src/dev/alpha/tsunami_pchip.cc
rename : src/dev/tsunami_pchip.hh => src/dev/alpha/tsunami_pchip.hh
rename : src/dev/tsunamireg.h => src/dev/alpha/tsunamireg.h
extra : convert_revision :
ffbb6fd93341d2623a6932bf096019b8976da694
Gabe Black [Tue, 7 Nov 2006 00:10:13 +0000 (19:10 -0500)]
Got rid of stray alpha include
--HG--
extra : convert_revision :
eddd64dd9291d6656821fe6387aeab2f9ddbaf58
Gabe Black [Tue, 7 Nov 2006 00:09:23 +0000 (19:09 -0500)]
Got rid of obsolete ivlb and ivle psuedo instructions.
--HG--
extra : convert_revision :
c3c2dd5a6e7181ad94194146d7fa2b33b21074fb
Gabe Black [Mon, 6 Nov 2006 23:30:28 +0000 (18:30 -0500)]
Stub for SPARC interrupt handling object.
--HG--
extra : convert_revision :
7257e3387c01e84e5a1018a9cdcc09a79edfa934
Gabe Black [Mon, 6 Nov 2006 23:29:58 +0000 (18:29 -0500)]
Remote GDB support has been changed to use inheritance. Alpha should work, but isn't tested. Other architectures will not.
--HG--
extra : convert_revision :
fc7e1e73e2f3b1a4ab9905a1eb98c5f07c6c8707
Gabe Black [Mon, 6 Nov 2006 23:28:10 +0000 (18:28 -0500)]
Took the Alpha prefix off of AlphaArguments, and made sure it was being used from TheISA:: rather than AlphaISA::
--HG--
extra : convert_revision :
17c143d3cbc2f58a7a9d01366a8f649810ff7f33
Gabe Black [Mon, 6 Nov 2006 23:26:11 +0000 (18:26 -0500)]
Created seperate SConscript for the dev directory. Made subdirectories for Alpha and SPARC and put SConscripts in them.
--HG--
rename : src/base/kgdb.h => src/arch/alpha/kgdb.h
rename : src/dev/alpha_access.h => src/dev/alpha/access.h
rename : src/dev/alpha_console.cc => src/dev/alpha/console.cc
rename : src/dev/alpha_console.hh => src/dev/alpha/console.hh
extra : convert_revision :
a7dd466308cb83edc40528689aacb72413089cdf
Ali Saidi [Mon, 6 Nov 2006 21:24:25 +0000 (16:24 -0500)]
delete pcifake, tsunamifake. Combine BadAddr/IsaFake into one
src/SConscript:
remove pcifake and tsunami fake from sconscript
src/dev/isa_fake.cc:
src/dev/isa_fake.hh:
combine badaddr and isa fake into one
src/python/m5/objects/Pci.py:
remove pcifake
src/python/m5/objects/Tsunami.py:
make badaddr derive from isafake
--HG--
extra : convert_revision :
91470db60aa1de6b85827304e27bd3414cc9d8d1
Ali Saidi [Mon, 6 Nov 2006 19:14:49 +0000 (14:14 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
f77e5cf8cc5b99960d28e1cc109d140f1013cfca
Ali Saidi [Mon, 6 Nov 2006 19:14:18 +0000 (14:14 -0500)]
small fixes for solaris
--HG--
extra : convert_revision :
3546b2cecf7e7e8e62295abc1ed08b3b6d2b0a8b
Kevin Lim [Mon, 6 Nov 2006 18:27:57 +0000 (13:27 -0500)]
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
--HG--
extra : convert_revision :
d6bb87586cf7ee63ca32e36944c3755fae0b55d0
Kevin Lim [Mon, 6 Nov 2006 18:27:45 +0000 (13:27 -0500)]
Clean up clock phase drift code a bit.
src/cpu/base.cc:
Move clock phase drift code to the base CPU so that any CPU model can use it.
src/cpu/base.hh:
Added two functions to help get the next cycle the CPU should be scheduled.
src/cpu/simple/atomic.cc:
src/cpu/simple/timing.cc:
Use the function now in BaseCPU.
--HG--
extra : convert_revision :
444494b66ffc85fc473c23f57683c5f9458ad80c
Ali Saidi [Mon, 6 Nov 2006 15:15:27 +0000 (10:15 -0500)]
replace NULL with 0.... Why isn't NULL defined by default on Mac OS X I don't know
--HG--
extra : convert_revision :
b60403445bd4e855732fd4e6753068abd90ecc9d
Kevin Lim [Mon, 6 Nov 2006 01:42:05 +0000 (20:42 -0500)]
Update refs.
--HG--
extra : convert_revision :
61d298fb0d9a66a76209a6bfcdb7c14f2efca947
Kevin Lim [Mon, 6 Nov 2006 01:29:38 +0000 (20:29 -0500)]
Initialize pointer to NULL.
src/cpu/o3/lsq_unit_impl.hh:
Be sure to initialize pointer to NULL.
--HG--
extra : convert_revision :
917d5119e4bd8eae10959ed07069d8c694315c7a
Ali Saidi [Sun, 5 Nov 2006 02:41:10 +0000 (21:41 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
d7133e32cfca9f15869ee9ab7a93e3470e7d9038
Ali Saidi [Sun, 5 Nov 2006 02:41:01 +0000 (21:41 -0500)]
fixes so that M5 will compile under solaris
SConstruct:
Add check to see if we need to include libsocket
src/arch/sparc/floatregfile.cc:
src/arch/sparc/intregfile.cc:
use memset rather than bzero and include the appropriate headerfile
src/base/pollevent.cc:
If we're compling under solaris we need sys/file.h
src/base/random.cc:
src/base/random.hh:
solaris doesn't have random(), so use rint with the correct rounding mode
if we're compiling on solaris
src/base/stats/flags.hh:
u_int32_t??
src/base/time.hh:
grab the timersub() define from freebsd since it doesn't exist in solaris
src/cpu/inst_seq.hh:
we don't need to include stdint here
src/sim/byteswap.hh:
the method to detect endianness on Solaris is a little more complex...
--HG--
extra : convert_revision :
6b7db0e900e7bccfc250d65c125065f27280dda1
Gabe Black [Fri, 3 Nov 2006 19:42:12 +0000 (14:42 -0500)]
Make things compile in SE again.
--HG--
extra : convert_revision :
cf7faf5001b31d61c61ddce2386d61c919075800
Gabe Black [Fri, 3 Nov 2006 19:41:27 +0000 (14:41 -0500)]
Use a PowerOnReset to initialize the cpu.
--HG--
extra : convert_revision :
9e65af095c37c7c67db377424d2d4363fa8065f9
Gabe Black [Fri, 3 Nov 2006 19:40:35 +0000 (14:40 -0500)]
Calling syscalls from within the trap instruction's invoke method won't work because apparently you need an xc for that and not a tc. Cleaned up the TrapInstruction fault in light of this.
--HG--
extra : convert_revision :
1805c9244cfd62d0ee7862d8fd7c9983e00c5747
Gabe Black [Fri, 3 Nov 2006 16:05:56 +0000 (11:05 -0500)]
The tc needs to be protected instead of private so that the CpuEventWrapper can access it.
--HG--
extra : convert_revision :
bd836d63ac3630b20dda552e7b289730f3c114ef
Gabe Black [Fri, 3 Nov 2006 16:05:13 +0000 (11:05 -0500)]
Gutted out the old Alpha stuff.
--HG--
extra : convert_revision :
6767dc1305a58e3e7eb0ee909d54768e51744927
Gabe Black [Fri, 3 Nov 2006 16:04:10 +0000 (11:04 -0500)]
Added a stub initCPU function. This would be a good place to force in a PowerOnReset fault to kick start the CPU.
--HG--
extra : convert_revision :
79e1fa2ef40e326682069639e260db255fd29d93
Gabe Black [Fri, 3 Nov 2006 16:03:03 +0000 (11:03 -0500)]
Compilation fixes.
--HG--
extra : convert_revision :
44d67a3bb95f875f17586499aa4a04268aa2fd46
Gabe Black [Fri, 3 Nov 2006 15:59:24 +0000 (10:59 -0500)]
Added this constant to get compilation to work. The value is bogus since I don't know what it actually represents.
--HG--
extra : convert_revision :
ab579c1275bfcfb7ffe21633bd8c5b9bea24015e
Gabe Black [Fri, 3 Nov 2006 15:56:47 +0000 (10:56 -0500)]
Add the syscall number as the second parameter for the trap fault. This could be improved and syscalls could be called from the trap's invoke method.
--HG--
extra : convert_revision :
127a3673a076110fb3605c0fbc93e8d7e9fec84b
Gabe Black [Fri, 3 Nov 2006 15:55:29 +0000 (10:55 -0500)]
Add an invoke function for PowerOnReset
--HG--
extra : convert_revision :
a1cdd35c74f6e85f42a04061b466ec7617da8ac2
Gabe Black [Fri, 3 Nov 2006 15:54:34 +0000 (10:54 -0500)]
Move around misc reg code
src/arch/sparc/faults.cc:
Moved some code here from miscregfile.cc
src/arch/sparc/miscregfile.cc:
Moved code from here to faults.cc, and merged (read|set)MiscRegWithEffect and it's FS version from ua2005.cc
src/arch/sparc/miscregfile.hh:
readFSRegWithEffect is no longer a seperate function, and is instead done in the main readRegWith Effect.
--HG--
extra : convert_revision :
0b45f0f78e83929b32ddd2f443c8b1dbf9bc04fb
Gabe Black [Fri, 3 Nov 2006 15:52:08 +0000 (10:52 -0500)]
removed ua2005.cc since it's been obsorbed into the miscregfile, and added system.cc
--HG--
extra : convert_revision :
2a124adcefe0d15860632a05e8788d3fd34008c2
Gabe Black [Fri, 3 Nov 2006 09:25:33 +0000 (04:25 -0500)]
Got rid of "inPalMode". Some places are still effectively checking if they are in PAL mode, however.
--HG--
extra : convert_revision :
b52d9642efc474eaf97437fa2df879efefa0062b
Gabe Black [Fri, 3 Nov 2006 07:25:39 +0000 (02:25 -0500)]
Add a new file which describes an ISA's interrupt handling mechanism. It records when interrupts are requested, and returns an interrupt to execute if the
--HG--
extra : convert_revision :
c535000a6a170caefd441687b60f940513d29739
Gabe Black [Fri, 3 Nov 2006 06:15:31 +0000 (01:15 -0500)]
Fixed a comment
--HG--
extra : convert_revision :
bebc701508e1d38ee74a07377c634d5e46e89abe
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
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
Kevin Lim [Thu, 2 Nov 2006 20:18:35 +0000 (15:18 -0500)]
Implement device that will return BadAddress.
--HG--
extra : convert_revision :
d833c20f691e01c84a0678f19f7d83f3ee50c0c1
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
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
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
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
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
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
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
Gabe Black [Thu, 2 Nov 2006 00:00:49 +0000 (19:00 -0500)]
Added code to handle draining.
--HG--
extra : convert_revision :
3861f553bde5865cd21a8a58a4c410896726f0a3
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
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
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
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
Gabe Black [Tue, 31 Oct 2006 23:59:50 +0000 (18:59 -0500)]
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
Gabe Black [Tue, 31 Oct 2006 23:39:17 +0000 (18:39 -0500)]
Fix another typo
--HG--
extra : convert_revision :
ad7058babf2a13bfe543e05f2662dc49a18a8b8b
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
Gabe Black [Tue, 31 Oct 2006 23:01:31 +0000 (18:01 -0500)]
Fix stupid typo
--HG--
extra : convert_revision :
fbfc82974e89b2c726b689674c9f5d957682b280
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
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
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
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
Gabe Black [Tue, 31 Oct 2006 21:18:54 +0000 (16:18 -0500)]
Forgot to change the index.
--HG--
extra : convert_revision :
5a444e635d20bcca445a10e43592b6c10d25e879
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
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
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
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
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
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
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