Steve Reinhardt [Sun, 12 Mar 2006 06:05:01 +0000 (01:05 -0500)]
Get rid of obsolete header that had only one declaration of
an obsolete function that doesn't exist.
arch/alpha/tru64/process.cc:
sim/process.cc:
Don't include useless header.
--HG--
extra : convert_revision :
1dd5edeb0703e2190b89ea5ff563df4c95b7cf59
Gabe Black [Fri, 10 Mar 2006 20:12:46 +0000 (15:12 -0500)]
Wrapped setSysCallReturn in !FULL_SYSTEM.
--HG--
extra : convert_revision :
c6d3a5af04731a92eaca2337424ba10926f0d879
Ali Saidi [Thu, 9 Mar 2006 21:17:10 +0000 (16:17 -0500)]
fix merging issues
arch/alpha/isa_traits.hh:
arch/sparc/linux/process.cc:
fix merging problem
sim/syscall_emul.cc:
use setIntReg
--HG--
extra : convert_revision :
e88d72e415493cd17d7b88c22c7e995f3199e396
Ali Saidi [Thu, 9 Mar 2006 20:56:42 +0000 (15:56 -0500)]
Merge zizzer:/bk/multiarch
into zeep.eecs.umich.edu:/z/saidi/work/m5.ma2
arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/sparc/isa_traits.hh:
arch/sparc/linux/process.cc:
sim/process.cc:
merge
--HG--
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision :
fea0155c8e23abbd0d5d5251abbd0f4d223fe935
Ali Saidi [Thu, 9 Mar 2006 20:42:09 +0000 (15:42 -0500)]
no more common syscall emulation, now common for everyone
check abi-tag note section of elf binary for OS
add pseudo functions (moved from alpha and made to be generic)
move setsyscallreturn into isa traits
arch/alpha/SConscript:
no more common syscall emulation, now common for everyone
arch/alpha/isa_traits.hh:
move setsyscallreturn into isa description
arch/alpha/linux/process.cc:
arch/alpha/tru64/process.cc:
use generic functions rather than alpha specific ones
arch/sparc/isa_traits.hh:
have consts for generic pseudo syscalls
arch/sparc/linux/process.cc:
use generic functions
base/loader/elf_object.cc:
check abi-tag note section of elf binary for OS
cpu/exec_context.hh:
move syssyscallreturn into isa traits
sim/process.cc:
find call num with a more generic
sim/syscall_emul.cc:
sim/syscall_emul.hh:
add pseudo functions (moved from alpha and made to be generic)
--HG--
extra : convert_revision :
5a31024ecde7e39b830365ddd84593ea501a34d2
Gabe Black [Thu, 9 Mar 2006 20:15:55 +0000 (15:15 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch
cpu/simple/cpu.cc:
Hand Merge
--HG--
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision :
bf664b092f993d0f4675ce8e7df13645a920c1f4
Kevin Lim [Thu, 9 Mar 2006 20:10:55 +0000 (15:10 -0500)]
Use functions to access XC.
cpu/exec_context.hh:
Include readNextNPC function.
cpu/simple/cpu.cc:
Use functions to set and access nextPC, nextNPC.
--HG--
extra : convert_revision :
22622b9c110e1d99cc9106a2a27c479579d7e1ad
Korey Sewell [Thu, 9 Mar 2006 08:27:51 +0000 (03:27 -0500)]
last changes before big merge
arch/alpha/isa_traits.hh:
arch/sparc/isa_traits.hh:
add nnpc for compiling purposes in exec_context setNextNPC function
cpu/exec_context.hh:
set NNPC function
cpu/simple/cpu.cc:
use NNPC in determining what PC we are using
--HG--
extra : convert_revision :
e810cfbc5dc31879b20d2cc40bf9871613203532
Korey Sewell [Thu, 9 Mar 2006 07:34:12 +0000 (02:34 -0500)]
minor comments to decoder.isa
arch/mips/isa/decoder.isa:
comments
--HG--
extra : convert_revision :
8e4fdf36d7f7365cda062bc169a313bf860a4fe5
Korey Sewell [Wed, 8 Mar 2006 21:54:08 +0000 (16:54 -0500)]
Merge zizzer:/bk/multiarch
into zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/multiarch-m5
--HG--
extra : convert_revision :
f3502f293f6ea44b5cf209ce2a935a25bca6054f
Korey Sewell [Wed, 8 Mar 2006 21:53:44 +0000 (16:53 -0500)]
add explicit support for nop,ssnop, and ehb instructions
--HG--
extra : convert_revision :
41151d38cabb6ce0ea81e5d78e4474d8f2ffeb67
Kevin Lim [Wed, 8 Mar 2006 20:10:47 +0000 (15:10 -0500)]
Include ability to copy all misc regs.
arch/alpha/ev5.cc:
Include function for the MiscRegFile to copy all of the Iprs from an ExecContext.
arch/alpha/isa_traits.hh:
Include functions to copy MiscRegs from an ExecContext.
cpu/cpu_exec_context.cc:
Be sure to copy all of the misc regs when copying all architectural state.
--HG--
extra : convert_revision :
cb948b5ff141ea0f739a1016f98236bd2a512f76
Kevin Lim [Wed, 8 Mar 2006 18:26:30 +0000 (13:26 -0500)]
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
arch/alpha/ev5.cc:
cpu/o3/cpu.hh:
SCCS merged
--HG--
extra : convert_revision :
38889011ea02005c8fd3a7f3b0be3395223f6166
Kevin Lim [Wed, 8 Mar 2006 16:34:41 +0000 (11:34 -0500)]
Forward declaration of MemoryController.
My change to exec_context.hh probably affected these files to no longer have MemoryController forward declared through a long chain of includes. MemoryController should be forward declared where it is used anyways.
dev/alpha_console.hh:
dev/uart.hh:
dev/uart8250.hh:
Forward declaration of MemoryController.
--HG--
extra : convert_revision :
afaac4014e0eb3b6d5d385cd4444b77511e03b51
Gabe Black [Wed, 8 Mar 2006 13:09:45 +0000 (08:09 -0500)]
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision :
5fe5a3d70774d6420b890237d9be4a5d0f00d17e
Gabe Black [Wed, 8 Mar 2006 13:09:27 +0000 (08:09 -0500)]
Working towards compiling SPARC_SE
arch/alpha/isa_traits.hh:
Changed the enums to const ints, and got rid of a few unnecessary constants.
arch/sparc/isa_traits.hh:
Got rid of the enums, and added in some missing constants.
--HG--
extra : convert_revision :
ee47890af9d8c67300b31d8e0dda1d580bd21479
Korey Sewell [Wed, 8 Mar 2006 09:36:55 +0000 (04:36 -0500)]
Update MiscReg enum and miscRegFile definition
update miscReg file access
arch/mips/isa/decoder.isa:
arch/mips/isa_traits.cc:
update miscRegfile access
arch/mips/isa_traits.hh:
Update MiscReg enum and miscRegFile definition
--HG--
extra : convert_revision :
9b6b9343d674e1e38e25bb9a4ffe4325142e7424
Korey Sewell [Wed, 8 Mar 2006 07:05:38 +0000 (02:05 -0500)]
updated MIPS ISA files .... all files should be able to compile/build with MIPS option except isa_traits.*
which I need to update the misc. regfile accesses
arch/mips/faults.cc:
arch/mips/faults.hh:
alpha to mips
arch/mips/isa/base.isa:
add includes
arch/mips/isa/bitfields.isa:
more bitfields
arch/mips/isa/decoder.isa:
lots o' lots o' lots o' changes!!!!
arch/mips/isa/formats.isa:
include cop0.isa
arch/mips/isa/formats/basic.isa:
fix faults
arch/mips/isa/formats/branch.isa:
arch/mips/isa/formats/fp.isa:
arch/mips/isa/formats/int.isa:
arch/mips/isa/formats/mem.isa:
arch/mips/isa/formats/noop.isa:
arch/mips/isa/formats/trap.isa:
arch/mips/isa/formats/unimp.isa:
arch/mips/isa/formats/unknown.isa:
arch/mips/isa/formats/util.isa:
arch/mips/isa/operands.isa:
arch/mips/isa_traits.cc:
arch/mips/linux_process.cc:
merge MIPS-specific comilable/buidable files code into multiarch
arch/mips/isa_traits.hh:
merge MIPS-specific comilable/buidable files code into multiarch... the miscRegs file accesses i have
need to be recoded and everything should build then ...
arch/mips/stacktrace.hh:
file copied over
--HG--
extra : convert_revision :
4a72e14fc5fb0a0d1f8b205dadbbf69636b7fb1f
Kevin Lim [Wed, 8 Mar 2006 04:44:30 +0000 (23:44 -0500)]
Use getProxy() instead of xcProxy; avoids confusion of where xcProxy must be set.
--HG--
extra : convert_revision :
548822baafe73b8041b7030feb1c4550fb80292f
Kevin Lim [Wed, 8 Mar 2006 03:56:12 +0000 (22:56 -0500)]
Needs forward declaration of MemoryController.
--HG--
extra : convert_revision :
07f397742a026cb6320dc29722d1db21157f26fa
Kevin Lim [Wed, 8 Mar 2006 03:24:37 +0000 (22:24 -0500)]
Fixes for accesses to the misc regs.
--HG--
extra : convert_revision :
47c7d90be5a147cb644f11980adcf8165b0ab3bb
Kevin Lim [Wed, 8 Mar 2006 03:23:14 +0000 (22:23 -0500)]
Avoid accessing objects directly within the XC.
--HG--
extra : convert_revision :
abda610caab885ae39b4e48df4f75cddb93b27ed
Kevin Lim [Wed, 8 Mar 2006 03:21:39 +0000 (22:21 -0500)]
Fixes to allow the ExecContext to be used for profiling.
cpu/base.cc:
Change to be calls through the ExecContext instead of accessing the profile object directly.
cpu/cpu_exec_context.cc:
Add functions to clear and sample the profile object.
cpu/cpu_exec_context.hh:
Add functions to clear and sample the profile object. These are not the most flexible functions; it might be better to eventually move the quiesce, profile, and store conditional stuff out of ExecContext so they don't clutter the interface.
cpu/exec_context.hh:
Include functions to support using the profile object to clear itself and take samples.
--HG--
extra : convert_revision :
40849915fd51303673451515debb9ecdc7afb8c8
Kevin Lim [Wed, 8 Mar 2006 01:01:34 +0000 (20:01 -0500)]
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
arch/alpha/faults.cc:
Hand merge.
--HG--
rename : arch/alpha/linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/tru64_process.cc => arch/alpha/tru64/process.cc
extra : convert_revision :
6ea1fae5be0ebd02eff330423d16da63b790516d
Kevin Lim [Wed, 8 Mar 2006 00:59:12 +0000 (19:59 -0500)]
Updates for the quiesceEvent that was added to the XC.
Also several files need to include system.hh or symtab.hh. This is because exec_context.hh has less #includes than before, requiring some of the files that include it to include some other files as well.
arch/alpha/faults.cc:
Avoid accessing XC directly.
arch/alpha/stacktrace.cc:
StackTrace needs to include system.hh.
cpu/cpu_exec_context.cc:
Update for change to CPUExecContext.
cpu/cpu_exec_context.hh:
Make quiesce events use CPUExecContext instead of ExecContext. Include functions to allow the quiesce event and last activate/suspend be accessed.
cpu/exec_context.hh:
Include functions for quiesceEvent.
cpu/intr_control.cc:
Needs to include cpu/exec_context.hh.
cpu/profile.cc:
Needs to include symtab.hh for the symbol table.
cpu/profile.hh:
Needs forward declare of ExecContext.
cpu/simple/cpu.cc:
Rename xc to cpuXC.
dev/tsunami_cchip.cc:
Needs to include exec_context.hh.
kern/kernel_stats.cc:
Needs to include system.hh.
kern/linux/events.cc:
Needs to include system.hh.
Also avoid accessing objects directly from the XC.
kern/tru64/dump_mbuf.cc:
Include symtab.hh for the SymbolTable and system.hh.
kern/tru64/tru64_events.cc:
Include system.hh
sim/pseudo_inst.cc:
Avoid accessing objects directly within the XC.
--HG--
extra : convert_revision :
78fe30d98cd20f7403fa216f772071458b675c84
Gabe Black [Tue, 7 Mar 2006 19:34:11 +0000 (14:34 -0500)]
Corrected a mispelling of "unimplemented".
arch/sparc/stacktrace.hh:
- Change the StackTrace code so that the class can more easily be
cleaned out and reused to avoid extra allocations.
- Allow trace() to accept a static instruction pointer so it can
determine if the instruction is worth tracing. This is moved from
the CPU.
- provide constants for special meaning PCs (user, console, unknown),
instead of magic numbers
arch/sparc/stacktrace.hh:
Added some typedefs for Addr and MachInst, and untemplatized StaticInstPtr
arch/sparc/stacktrace.hh:
Made Addr a global type
arch/sparc/stacktrace.hh:
bk cp ../alpha/stacktrace.hh stacktrace.hh
--HG--
extra : convert_revision :
8fd15e5ec8d676d081380b21886234561c5f3678
Gabe Black [Tue, 7 Mar 2006 19:08:01 +0000 (14:08 -0500)]
Pushed ev5.hh out of the non-alpha code.
arch/SConscript:
ev5 should now be contained within alpha specific code.
arch/alpha/ev5.cc:
arch/alpha/isa_traits.hh:
Added getInstAsid and getDataAsid functions. These should be removed when the SimpleScalar cpu model is removed.
arch/sparc/isa_traits.hh:
Added getInstAsid and getDataAsid functions. These should be removed when the SimpleScalar cpu model is removed. Also made some small fixes.
cpu/o3/alpha_cpu.hh:
Added typedefs which are required now that there isn't a using namespace EV5.
cpu/o3/alpha_cpu_impl.hh:
Some small changes so that ev5.hh isn't needed directly.
cpu/o3/cpu.hh:
Removed including ev5.hh, and pushed retrieving the Asid into the MiscRegFile.
cpu/o3/regfile.hh:
Removed the include of ev5.hh, using namespace EV5, and the now redundant ipr array.
--HG--
extra : convert_revision :
5ef8f69435a3a888a3f06d0095d89326dafb33fd
Gabe Black [Tue, 7 Mar 2006 14:34:24 +0000 (09:34 -0500)]
The a.out and ecoff object file formats will only be supported on Alpha for now.
arch/SConscript:
aout_machdep.h and ecoff_machdep.h are no longer bridging headers, since support of these formats is limitted to alpha.
base/loader/exec_aout.h:
Include the alpha specific version of aout_machdep.h, since only the alpha version of aout will be supported for now.
base/loader/exec_ecoff.h:
Include the alpha specific version of ecoff_machdep.h, since only the alpha version of ecoff will be supported for now.
--HG--
extra : convert_revision :
15328aae54538c26d2c10d7476501e0daa3d22d0
Gabe Black [Tue, 7 Mar 2006 14:11:00 +0000 (09:11 -0500)]
Got rid of some commented out code.
--HG--
extra : convert_revision :
7de82ed72650d877cdb2ecb66c61ae41117658d9
Gabe Black [Tue, 7 Mar 2006 12:34:43 +0000 (07:34 -0500)]
Fixed up some issues to be more compilable.
--HG--
extra : convert_revision :
a70d9cdbe26f44fa9d94e1cbadd92f8c909596ec
Gabe Black [Tue, 7 Mar 2006 09:42:06 +0000 (04:42 -0500)]
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision :
ead388289742233b5e4f0b37d979e54852cc99b2
Gabe Black [Tue, 7 Mar 2006 09:34:21 +0000 (04:34 -0500)]
Changed the include paths to take advantage of the os specific directories.
--HG--
extra : convert_revision :
287d5323268806adc7cfb9cb3600605e837e3764
Gabe Black [Tue, 7 Mar 2006 09:33:40 +0000 (04:33 -0500)]
Clean up of the SPARC isa_traits. This still doesn't compile, but it's closer.
--HG--
extra : convert_revision :
7b22a4a4af5bcb13e2d9322ef93d3f582e8efa92
Gabe Black [Tue, 7 Mar 2006 09:33:10 +0000 (04:33 -0500)]
Clean up of the SPARC isa description.
--HG--
extra : convert_revision :
21fe35fe4719f487168c89dd7bfc87dc38af0267
Gabe Black [Tue, 7 Mar 2006 09:32:34 +0000 (04:32 -0500)]
Implemented SPARC fault classes.
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Implemented the SPARC fault classes. The invoke method still needs to be written, but this depends on the misc regfile.
--HG--
extra : convert_revision :
bc9d2785600cee5ea1cba72e563ca5d1a20f37fd
Gabe Black [Tue, 7 Mar 2006 09:31:38 +0000 (04:31 -0500)]
Some clean up work with faults.
arch/alpha/faults.cc:
Renamed the _stat stat to a more descriptive _count, got rid of some old commented out code, and moved common fault handling code, ie recording that the fault happend and that it wasn't mispeculated, into the FaultBase class.
arch/alpha/faults.hh:
Renamed the _stat stat to the more descriptive _count, and renamed the appropriate accessor functions.
kern/kernel_stats.cc:
kern/kernel_stats.hh:
The fault statistics are now handled by the fault classes themselves.
sim/faults.cc:
The default implementation of the "invoke" method now does what all faults should do first, ie record that the fault happened, and make sure the fault isn't being executed on a mispeculated execution path.
sim/faults.hh:
There is now a default implementation of invoke, and the stat function is taken care of in the architecture specific fault classes.
--HG--
extra : convert_revision :
f6656fbea991df9addf85cad740ac37b1036b71a
Gabe Black [Tue, 7 Mar 2006 09:25:42 +0000 (04:25 -0500)]
Moved where some alpha specific source files were mentioned to be in the alpha specific Sconscript, and took advantage of the os specific directories for the process files.
arch/sparc/faults.cc:
Remove fake fault, fix to have normal m5 line length limit, and change pointers to be const pointers so that the default faults aren't changed accidentally.
arch/sparc/faults.hh:
Fix to have normal m5 line length limit, change pointers to const pointers.
arch/sparc/faults.hh:
Added a typedef for the Addr type, and changed the formatting of the faults slightly.
arch/sparc/faults.hh:
ur
Using cleaned up fault class dei
\7ff
\7ffinitions
arch/sparc/faults.hh:
Added typedef for Addr
arch/sparc/faults.hh:
Made Addr a global type
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Changed Fault * to Fault, which is a typedef to FaultBase *, which is the old Fault class renamed.
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Changed Fault to be a RefCountingPtr
arch/sparc/faults.cc:
arch/sparc/faults.hh:
MachineCheckFaults and AlignmentFaults are now generated by the ISA, rather than being created directly.
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Put the Alpha faults into the AlphaISA namespace
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Moved the _stat for MachineCheckFault and AlignmentFault into the isa specific classes to prevent instantiation of the generic classes.
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Changed ev5_trap from a function of the execution context to a function of the fault. The actual function still resides in the execution context.
arch/sparc/faults.cc:
AlphaFault is now an abstract class.
arch/sparc/faults.hh:
AlphaFault is now an abstract class. Also, AlphaMachineCheckFault and AlphaAlignmentFault multiply inherit from both AlphaFault and from MachineCheckFault and AlignmentFault respectively. These classes get their name from the generic classes.
arch/sparc/faults.cc:
arch/sparc/faults.hh:
moved ev5_trap fully into the fault class.
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Changed the name of the fault's invocation method from ev5_trap to invoke.
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Moved the fault invocation code into the fault class fully, and got rid of the need for isA.
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Got rid of the multiple inheritance in the Fault classes, and the base MachineCheck and Alignment faults.
arch/sparc/faults.cc:
bk cp ../alpha/faults.cc faults.cc
arch/sparc/faults.hh:
bk cp ../alpha/faults.hh faults.hh
SConscript:
Moved the alpha specific source files into the alpha specific SConscript
arch/alpha/SConscript:
Moved the alpha specific source files into the alpha specific SConscript, and moved the process files into the new os specific subfolders.
arch/alpha/linux/process.cc:
arch/alpha/process.hh:
arch/sparc/process.hh:
arch/alpha/tru64/process.cc:
Changed the include paths to use the new os specific directories.
--HG--
rename : arch/alpha/linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/linux_process.hh => arch/alpha/linux/process.hh
rename : arch/alpha/tru64_process.cc => arch/alpha/tru64/process.cc
rename : arch/alpha/tru64_process.hh => arch/alpha/tru64/process.hh
rename : arch/sparc/linux_process.cc => arch/sparc/linux/process.cc
rename : arch/sparc/linux_process.hh => arch/sparc/linux/process.hh
extra : convert_revision :
dc7eed7994b9c5e7308c771f43758292e78ce3e3
Steve Reinhardt [Tue, 7 Mar 2006 07:11:11 +0000 (02:11 -0500)]
Rename default options path from "build_options/default" to "default_options",
and current options path from "build_options/current" to "options".
This way we can symlink default_options to a different build dir
w/o clobbering the current options.
--HG--
rename : build/build_options/default/ALPHA_FS => build/default_options/ALPHA_FS
rename : build/build_options/default/ALPHA_FS_TL => build/default_options/ALPHA_FS_TL
rename : build/build_options/default/ALPHA_SE => build/default_options/ALPHA_SE
rename : build/build_options/default/MIPS_SE => build/default_options/MIPS_SE
rename : build/build_options/default/SPARC_SE => build/default_options/SPARC_SE
extra : convert_revision :
8c0d3139cdd7e9ed40a9f2deeb47f65f24e52799
Kevin Lim [Sun, 5 Mar 2006 05:34:54 +0000 (00:34 -0500)]
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
Further changes still need to be made to the XC code.
arch/alpha/ev5.cc:
arch/alpha/freebsd/system.cc:
arch/alpha/linux/system.cc:
base/remote_gdb.cc:
cpu/cpu_exec_context.cc:
cpu/cpu_exec_context.hh:
cpu/simple/cpu.cc:
cpu/simple/cpu.hh:
kern/kernel_stats.cc:
sim/pseudo_inst.cc:
Hand merge.
--HG--
rename : kern/freebsd/freebsd_system.cc => arch/alpha/freebsd/system.cc
rename : kern/linux/linux_system.cc => arch/alpha/linux/system.cc
rename : kern/linux/linux_threadinfo.hh => arch/alpha/linux/threadinfo.hh
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux_process.cc
rename : arch/alpha/alpha_memory.cc => arch/alpha/tlb.cc
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64_process.cc
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision :
c1fe71fdd87d1fcd376f4feec69fc3fa29152e3e
Kevin Lim [Sun, 5 Mar 2006 05:13:32 +0000 (00:13 -0500)]
Remove call to swap_palshadow that is no longer needed.
arch/alpha/faults.cc:
Remove call to swap_palshadow.
--HG--
extra : convert_revision :
10282c11080379fc4e8a166ff35d18d728f0d5a4
Kevin Lim [Sun, 5 Mar 2006 04:37:45 +0000 (23:37 -0500)]
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-shadowregs
--HG--
extra : convert_revision :
31c1bcc2c52d88bd5133a2007f9feefa2c04b6aa
Gabe Black [Sun, 5 Mar 2006 03:32:13 +0000 (22:32 -0500)]
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
arch/alpha/system.cc:
Hand merged
--HG--
extra : convert_revision :
34d7608d21dc6dee3a3feed5e5671f5de6ebfa26
Gabe Black [Sun, 5 Mar 2006 03:30:09 +0000 (22:30 -0500)]
Changed targetarch to arch
--HG--
extra : convert_revision :
f54d8afd2c7eb338133046e612cddc1d5689a55c
Ali Saidi [Sun, 5 Mar 2006 02:17:24 +0000 (21:17 -0500)]
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.head
--HG--
extra : convert_revision :
faf71f4ed7d97734835fc7cd552e21b356b8d864
Steve Reinhardt [Sun, 5 Mar 2006 02:06:40 +0000 (21:06 -0500)]
Emulated syscalls should return -errno on failure
(not plain errno). Thanks to Jos Delbar.
--HG--
extra : convert_revision :
bd15ba1c99f25b8560938566d3922734172ab905
Ali Saidi [Sun, 5 Mar 2006 01:45:13 +0000 (20:45 -0500)]
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.head
--HG--
extra : convert_revision :
405920a23690089a02a5b75cfe947885d8749dc4
Ali Saidi [Sun, 5 Mar 2006 01:45:01 +0000 (20:45 -0500)]
move alpha specific code into arch/alpha
System -> AlphaSystem
SConscript:
Move some more files around
arch/alpha/freebsd/system.cc:
arch/alpha/freebsd/system.hh:
System -> AlphaSystem
arch/alpha/linux/aligned.hh:
arch/alpha/linux/hwrpb.hh:
arch/alpha/linux/system.cc:
arch/alpha/linux/thread_info.hh:
arch/alpha/linux/threadinfo.hh:
move alpha specific code into arch/alpha
python/m5/objects/System.py:
Split off arch specific parts of system into AlphaSystem
--HG--
rename : kern/freebsd/freebsd_system.cc => arch/alpha/freebsd/system.cc
rename : kern/freebsd/freebsd_system.hh => arch/alpha/freebsd/system.hh
rename : kern/linux/aligned.hh => arch/alpha/linux/aligned.hh
rename : kern/linux/hwrpb.hh => arch/alpha/linux/hwrpb.hh
rename : kern/linux/linux_system.cc => arch/alpha/linux/system.cc
rename : kern/linux/linux_system.hh => arch/alpha/linux/system.hh
rename : kern/linux/thread_info.hh => arch/alpha/linux/thread_info.hh
rename : kern/linux/linux_threadinfo.hh => arch/alpha/linux/threadinfo.hh
rename : kern/tru64/tru64_system.cc => arch/alpha/tru64/system.cc
rename : kern/tru64/tru64_system.hh => arch/alpha/tru64/system.hh
extra : convert_revision :
1c496efb823326a4b629574bd9b5f30e99a0aa40
Kevin Lim [Sat, 4 Mar 2006 20:23:06 +0000 (15:23 -0500)]
Merge ktlim@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/m5-shadowregs
--HG--
extra : convert_revision :
570b1c4331075587a866dfada7fbe51805cdcad4
Kevin Lim [Sat, 4 Mar 2006 20:18:40 +0000 (15:18 -0500)]
Steps towards setting up the infrastructure to allow the new CPU model to work in full system mode.
The major change is renaming the old ExecContext to CPUExecContext, and creating two new classes, ExecContext (an abstract class), and ProxyExecContext (a templated class that derives from ExecContext).
Code outside of the CPU continues to use ExecContext as normal (other than not being able to access variables within the XC). The CPU uses the CPUExecContext, or however else it stores its own state. It then creates a ProxyExecContext, templated on the class used to hold its state. This proxy is passed to any code outside of the CPU that needs to access the XC. This allows code outside of the CPU to use the ExecContext interface to access any state needed, without knowledge of how that state is laid out.
Note that these changes will not compile without the accompanying revision to automatically rename the shadow registers.
SConscript:
Include new file, cpu_exec_context.cc.
arch/alpha/alpha_linux_process.cc:
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_tru64_process.cc:
arch/alpha/arguments.cc:
arch/alpha/isa/decoder.isa:
arch/alpha/stacktrace.cc:
arch/alpha/vtophys.cc:
base/remote_gdb.cc:
cpu/intr_control.cc:
Avoid directly accessing objects within the XC.
arch/alpha/ev5.cc:
Avoid directly accessing objects within the XC.
KernelStats have been moved to the BaseCPU instead of the XC.
arch/alpha/isa_traits.hh:
Remove clearIprs(). It wasn't used very often and it did not work well with the proxy ExecContext.
cpu/base.cc:
Place kernel stats within the BaseCPU instead of the ExecContext.
For now comment out the profiling code sampling until its exact location is decided upon.
cpu/base.hh:
Kernel stats are now in the BaseCPU instead of the ExecContext.
cpu/base_dyn_inst.cc:
cpu/base_dyn_inst.hh:
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
Changes to support rename of old ExecContext to CPUExecContext. See changeset for more details.
cpu/exetrace.cc:
Remove unneeded include of exec_context.hh.
cpu/intr_control.hh:
cpu/o3/alpha_cpu_builder.cc:
Remove unneeded include of exec_context.hh
cpu/o3/alpha_cpu.hh:
cpu/o3/alpha_cpu_impl.hh:
cpu/o3/cpu.cc:
cpu/o3/cpu.hh:
cpu/simple/cpu.cc:
cpu/simple/cpu.hh:
Changes to support rename of old ExecContext to CPUExecContext. See changeset for more details.
Also avoid accessing anything directly from the XC.
cpu/pc_event.cc:
Avoid accessing objects directly from the XC.
dev/tsunami_cchip.cc:
Avoid accessing objects directly within the XC>
kern/freebsd/freebsd_system.cc:
kern/linux/linux_system.cc:
kern/linux/linux_threadinfo.hh:
kern/tru64/dump_mbuf.cc:
kern/tru64/tru64.hh:
kern/tru64/tru64_events.cc:
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Avoid accessing objects directly within the XC.
kern/kernel_stats.cc:
kern/kernel_stats.hh:
Kernel stats no longer exist within the XC.
kern/system_events.cc:
Avoid accessing objects directly within the XC. Also kernel stats are now in the BaseCPU.
sim/process.cc:
sim/process.hh:
Avoid accessing regs directly within an ExecContext. Instead use a CPUExecContext to initialize the registers and copy them over.
cpu/cpu_exec_context.cc:
Rename old ExecContext to CPUExecContext. This is used by the old CPU models to store any necessary architectural state. Also include the ProxyExecContext, which is used to access the CPUExecContext's state in code outside of the CPU.
cpu/cpu_exec_context.hh:
Rename old ExecContext to CPUExecContext. This is used by the old CPU models to store any necessary architectural state. Also include the ProxyExecContext, which is used to access the CPUExecContext's state in code outside of the CPU.
Remove kernel stats from the ExecContext.
sim/pseudo_inst.cc:
Kernel stats now live within the CPU.
Avoid accessing objects directly within the XC.
--HG--
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision :
a75393a8945c80cca225b5e9d9c22a16609efb85
Ali Saidi [Sat, 4 Mar 2006 20:15:47 +0000 (15:15 -0500)]
properly align the uid and size fields in the pre_F54_stat structure.
Patch from Jos Delbar, modified to use variable attributes.
--HG--
extra : convert_revision :
12c9ebbb109a789dd4230b7606b1f8ded00c21fc
Kevin Lim [Sat, 4 Mar 2006 18:06:24 +0000 (13:06 -0500)]
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-shadowregs
arch/alpha/ev5.cc:
Remove intr_post, it is no longer used.
arch/alpha/isa_traits.hh:
Hand merge.
--HG--
extra : convert_revision :
94f14539a9e5646f8c368b15b2dff18ab2f492cf
Ali Saidi [Sat, 4 Mar 2006 17:35:13 +0000 (12:35 -0500)]
we REALLY don't want to use system headers for libelf...
use "" not <>
targetarch->arch
arch/alpha/system.cc:
targetarch -> arch
base/loader/elf_object.cc:
we REALLY don't want to use system headers for libelf...
use "" not <>
--HG--
extra : convert_revision :
d0e1672dc655dca3081e36b2158e7b19ef54af40
Gabe Black [Sat, 4 Mar 2006 08:19:58 +0000 (03:19 -0500)]
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision :
cb6de8d050ac5abb8f61eb5780deeb06e93b1a0c
Gabe Black [Sat, 4 Mar 2006 08:16:16 +0000 (03:16 -0500)]
General small SPARC fixups
arch/sparc/SConscript:
Fixed up the SPARC SConscript to use the name of the SPARC source files.
arch/sparc/linux_process.cc:
Changed the namespace name from SPARCISA to SparcISA.
--HG--
extra : convert_revision :
c340fbf78200bf7d962e7578a3f2998860224c53
Gabe Black [Sat, 4 Mar 2006 08:10:34 +0000 (03:10 -0500)]
Removed the commented out declaration of the Addr type.
--HG--
extra : convert_revision :
70612a3efc877febbff0c8fb9065dea7e1d12cd8
Gabe Black [Sat, 4 Mar 2006 08:09:23 +0000 (03:09 -0500)]
Filled out the object file loader so it can load object files for several OSs and architectures.
SConscript:
Added ./libelf as an include search directory. There might be a better spot for this than where I put it.
arch/SConscript:
Combined the linux_process.h and tru64_process.h into process.h. This allows each ISA to support processes from arbitrary OSs.
arch/alpha/SConscript:
Added process.cc as a source file. It provides an implementation of createProcess, which takes an object_file object and creates the appropriate process object, or dies.
base/loader/elf_object.cc:
Actually extract the OS and architecture from the elf file, rather than always guessing Alpha and Linux.
base/loader/object_file.hh:
Added constants for SPARC, MIPS, and Solaris, and changed the include for the Addr type.
sim/process.cc:
Pushed creation of specific process objects into the ISA specific code.
--HG--
extra : convert_revision :
b4754e7ca8328672d07e1394c4d162e199606b53
Kevin Lim [Fri, 3 Mar 2006 21:04:34 +0000 (16:04 -0500)]
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-shadowregs
--HG--
extra : convert_revision :
979ab1fc4e1ea4d6a78ac9a2ec894f0be4feb01d
Kevin Lim [Fri, 3 Mar 2006 20:41:57 +0000 (15:41 -0500)]
Remove intr_post function. No longer being used.
--HG--
extra : convert_revision :
1dc1d691244fd2edbd21d5cbf0764622d8f95fbb
Kevin Lim [Fri, 3 Mar 2006 20:28:25 +0000 (15:28 -0500)]
Changes to support automatic renaming of the shadow registers at decode time. This requires using an ExtMachInst (uint64_t) instead of the normal MachInst; the ExtMachInst is packed with extra decode context information. In the case of Alpha, the PAL mode is included.
The shadow registers are folded into the normal integer registers to ease renaming indexing.
Include the removed Opcdec class of instructions for faulting when a pal mode only instruction is decoded in non-pal mode.
arch/alpha/ev5.cc:
Changes to automatically map the shadow registers if the instruction is in PAL mode.
arch/alpha/isa/branch.isa:
arch/alpha/isa/decoder.isa:
arch/alpha/isa/fp.isa:
arch/alpha/isa/int.isa:
arch/alpha/isa/mem.isa:
arch/alpha/isa/pal.isa:
arch/alpha/isa/unimp.isa:
Changes for automatically using the shadow registers. Now instructions must decode based on an ExtMachInst, which is a MachInst with any decode context information concatenated onto the higher order bits.
arch/alpha/isa/main.isa:
Changes for automatically using the shadow registers. Now instructions must decode based on an ExtMachInst, which is a MachInst with any decode context information concatenated onto the higher order bits.
The decoder (for Alpha) uses the 32nd bit in order to determine if the machine is in PAL mode. If it is, then it refers to the reg_redir table to determine the true index of the register it is using.
Also include the opcdec instruction definition.
arch/alpha/isa_traits.hh:
Define ExtMachInst type that is used by the static inst in order to decode the instruction, given the context of being in pal mode or not.
Redefine the number of Int registers, splitting it into NumIntArchRegs (32) and NumIntRegs (32 + 8 shadow registers).
Change the dependence tags to reflect the integer registers include the 8 shadow registers.
Define function to make an ExtMachInst. Currently it is somewhat specific to Alpha; in the future it must be decided to make this more generic and possibly slower, or leave it specific to each architecture and ifdef it within the CPU.
arch/isa_parser.py:
Have static insts decode on the ExtMachInst.
base/remote_gdb.cc:
Support the automatic remapping of shadow registers. Remote GDB must now look at the PC being read in order to tell if it should use the normal register indices or the shadow register indices.
cpu/o3/regfile.hh:
Comment out the pal registers; they are now a part of the integer registers.
cpu/simple/cpu.cc:
Create an ExtMachInst to decode on, based on the normal MachInst and the PC of the instructoin.
cpu/static_inst.hh:
Change from MachInst to ExtMachInst to support shadow register renaming.
--HG--
extra : convert_revision :
1d23eabf735e297068e1917445a6348e9f8c88d5
Ali Saidi [Fri, 3 Mar 2006 19:25:26 +0000 (14:25 -0500)]
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.head
--HG--
extra : convert_revision :
8f463682e32a457cd9171c63dcec5209cb850b56
Ali Saidi [Fri, 3 Mar 2006 19:24:15 +0000 (14:24 -0500)]
First cut at moving alpha specefic stuff out of /sim/system* into
arch/alpha/system*.
SConscript:
dev/alpha_console.cc:
dev/alpha_console.hh:
kern/freebsd/freebsd_system.cc:
kern/freebsd/freebsd_system.hh:
kern/kernel_stats.cc:
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
kern/tru64/tru64_system.cc:
kern/tru64/tru64_system.hh:
sim/pseudo_inst.cc:
sim/system.cc:
sim/system.hh:
First cut at moving alpha specefic stuff out of /sim/system*
--HG--
extra : convert_revision :
eba58f537fc04e605af4fc216e184b074a44c8a0
Nathan Binkert [Fri, 3 Mar 2006 19:17:48 +0000 (14:17 -0500)]
Ethernet devices have an RSS option to tell the driver to
use Receive side scaling
dev/ns_gige.cc:
dev/ns_gige.hh:
dev/ns_gige_reg.h:
dev/sinic.cc:
dev/sinic.hh:
dev/sinicreg.hh:
add support for setting the RSS flag to notify the driver
to use RSS
--HG--
extra : convert_revision :
5f0c11668ae976634b3bf0caad669a9464a4c041
Gabe Black [Fri, 3 Mar 2006 02:44:43 +0000 (21:44 -0500)]
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision :
f6db244a66431dd6b8c5ba251ed02d76cd509cff
Ali Saidi [Thu, 2 Mar 2006 22:49:12 +0000 (17:49 -0500)]
Fix fault handling, dereferincing a null pointer is bad.
--HG--
extra : convert_revision :
a4f658bfd39b7f1d219ad8929b8f45457f49299f
Gabe Black [Thu, 2 Mar 2006 00:03:42 +0000 (19:03 -0500)]
Got rid of the multiple inheritance in the Fault classes, and the base MachineCheck and Alignment faults.
--HG--
extra : convert_revision :
4b1429ef5c7a11c25e28f2bc868cc1481a08c5d1
Ali Saidi [Wed, 1 Mar 2006 17:43:04 +0000 (12:43 -0500)]
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.q
--HG--
extra : convert_revision :
4855ecfb3de652456a8be413c9e538c91709dcb6
Gabe Black [Wed, 1 Mar 2006 10:28:26 +0000 (05:28 -0500)]
Begain setting up syscall emulation for sparc linux.
arch/sparc/linux_process.cc:
Began modifying this file for sparc, and replaced the alpha syscall numbers with the sparc ones.
arch/sparc/linux_process.hh:
Begain modifying this file for sparc.
--HG--
extra : convert_revision :
b1ed8ac50a35591521c5feaf1ea9c4b8ccc26dc8
Gabe Black [Wed, 1 Mar 2006 10:26:08 +0000 (05:26 -0500)]
Cleaned up some of the Fault system.
arch/alpha/ev5.cc:
Commented out the intr_post function since it's not used. If this really -is- needed, it should be moved into the fault class.
arch/alpha/faults.cc:
arch/alpha/faults.hh:
Moved the fault invocation code into the fault class fully, and got rid of the need for isA.
cpu/exec_context.cc:
cpu/exec_context.hh:
Removed the trap function from the ExecContext. The faults will execute normally in full system mode, but always panic in syscall emulation mode.
cpu/ozone/cpu.hh:
cpu/simple/cpu.hh:
Changed the execution context executing a fault to a fault executing on the execution context.
sim/faults.cc:
If not in full system mode, trying to invoke a fault causes a panic.
sim/faults.hh:
Removed the isA function.
--HG--
extra : convert_revision :
894dc8f0755c8efc4b7ef5a09fb2cf7373042395
Gabe Black [Wed, 1 Mar 2006 10:21:16 +0000 (05:21 -0500)]
Removed the targetarch code.
--HG--
extra : convert_revision :
ab0c8ed2e8d7359b353f34b443e84094ca40c5e6
Gabe Black [Wed, 1 Mar 2006 10:20:47 +0000 (05:20 -0500)]
Made sparc copies of some architecture specific files.
arch/sparc/linux_process.cc:
arch/sparc/linux_process.hh:
Formatting & doxygen.
arch/sparc/linux_process.cc:
Added some more ioctl commands to ignore.
Set unlink and rename to the new functions.
Ignore setrlimit, times and rt_sigaction.
Should eventually provide a function for times.
arch/sparc/linux_process.cc:
Fixes for Linux emulation:
- stat struct alignment
- osf_{get,set}sysinfo return values
- additional syscall numbers
- initialize $r0 to 0
arch/sparc/linux_process.cc:
arch/sparc/linux_process.hh:
Updated Copyright
arch/sparc/linux_process.cc:
Alphabetize includes.
arch/sparc/linux_process.cc:
Changed all syscalls to use syscall return object
arch/sparc/linux_process.cc:
Removed unecessary constructor call at each return.
arch/sparc/linux_process.cc:
Rename sim/universe.{cc,hh} to root.{cc,hh}.
arch/sparc/linux_process.cc:
shuffle files around for new directory structure
arch/sparc/linux_process.cc:
Remove RCS Id string
arch/sparc/linux_process.cc:
arch/sparc/linux_process.hh:
Update copyright dates and author list
arch/sparc/linux_process.hh:
remove $Id$ string
arch/sparc/linux_process.cc:
Apply patch for syscall emulation provided by Antti Miettinen (apm@brigitte.dna.fi).
arch/sparc/linux_process.cc:
Added the endianness namespace. This may change.
arch/sparc/linux_process.cc:
Replaced the namespace declaration with including arch/alpha/isa_traits.hh
arch/sparc/linux_process.cc:
fixup for bsd hosts. Some headers are included by default which means that
more variables need TGT_ prefixes and there isn't a stat call (everything
is a stat64 call) so we have to work around that a bit
arch/sparc/linux_process.cc:
Add endian conversions to fstat
arch/sparc/linux_process.cc:
fix #if. I wonder why my compiler had no issues
arch/sparc/linux_process.cc:
add endian conversions for fstat functions
arch/sparc/linux_process.cc:
move architecture independent code into kern/linux/linux.(hh|cc)
arch/sparc/linux_process.hh:
Add getDesc function
arch/sparc/linux_process.cc:
Added using directive for AlphaISA namespace
arch/sparc/linux_process.cc:
Add pipeFunc.
arch/alpha/linux_process.cc:
Renamed arch files to remove alpha prefix, and changed alpha_memory.hh and cc to a more accurate tlb.hh and cc
arch/sparc/linux_process.cc:
bk cp ../alpha/linux_process.cc linux_process.cc
arch/sparc/linux_process.hh:
bk cp ../alpha/linux_process.hh linux_process.hh
--HG--
extra : convert_revision :
a8eca1c5f848383263a2326b0e3cde4bcd85f14b
Gabe Black [Wed, 1 Mar 2006 06:23:10 +0000 (01:23 -0500)]
Changed the name of the fault's invocation method from ev5_trap to invoke.
--HG--
extra : convert_revision :
b7ab14ac644f6a38c69aaa5372b3002b21f34af0
Gabe Black [Wed, 1 Mar 2006 05:14:09 +0000 (00:14 -0500)]
Used the Fault constructor to create Interrupt faults. Using the pointer directly prevents reference counting from working correctly.
cpu/simple/cpu.cc:
Used the Fault constructor to create an Interrupt fault.
--HG--
extra : convert_revision :
ec2ef7e3cd04ee9a44628877dc6e770fb907104b
Gabe Black [Wed, 1 Mar 2006 05:09:08 +0000 (00:09 -0500)]
moved ev5_trap fully into the fault class.
--HG--
extra : convert_revision :
182cdec9a4e05f55edff0c6a114844b9ad2ca8db
Ali Saidi [Tue, 28 Feb 2006 23:41:04 +0000 (18:41 -0500)]
Add quiesceNs, quiesceTime, quiesceCycles, and m5panic pseudo ops.
This changeset removes a check that prevents quiescing when an
interrupt is pending. *** You should only call quiesce if that
isn't a problem. ***
arch/alpha/isa/decoder.isa:
sim/pseudo_inst.cc:
sim/pseudo_inst.hh:
Add quiesceNs, quiesceCycles, quisceTime and m5panic pseudo ops.
These quiesce for a number of ns, cycles, report how long
we were quiesced for, and panic the simulator respectively.
The latter is added to the panic() function in the console and linux
kernel instead of executing an infinite loop until someone notices.
cpu/exec_context.cc:
cpu/exec_context.hh:
Add a quiesce end event to the execution contexted which upon
executing wakes up a CPU for quiesceCycles/quiesceNs.
util/m5/Makefile:
Make the makefile more reasonable
util/m5/m5.c:
update the m5op executable to use the files from the linux tree
util/m5/m5op.S:
update m5op.S from linux tree
util/m5/m5op.h:
update m5op.h from linux tree
--HG--
rename : util/m5/m5op.s => util/m5/m5op.S
extra : convert_revision :
3be18525e811405b112e33f24a8c4e772d15462d
Kevin Lim [Tue, 28 Feb 2006 20:16:24 +0000 (15:16 -0500)]
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean
arch/alpha/ev5.cc:
cpu/o3/regfile.hh:
Hand merge.
--HG--
rename : arch/alpha/alpha_memory.cc => arch/alpha/tlb.cc
extra : convert_revision :
c941dd2198851398820b38a66471372ed8454891
Gabe Black [Tue, 28 Feb 2006 11:28:09 +0000 (06:28 -0500)]
Corrected some mistakes in the hand merge
--HG--
extra : convert_revision :
84d852e625f754c4414403e8c3e26bda80500d4f
Gabe Black [Tue, 28 Feb 2006 11:17:57 +0000 (06:17 -0500)]
Hand merged
--HG--
extra : convert_revision :
0fd5ecbba5dc6299dd046926ec27595ca4d97ee7
Gabe Black [Tue, 28 Feb 2006 11:13:35 +0000 (06:13 -0500)]
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision :
0b3ffc0605c9043d7f5bf6c15f4a3c68846a732a
Gabe Black [Tue, 28 Feb 2006 11:03:57 +0000 (06:03 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch
--HG--
extra : convert_revision :
3a3ff8fcf472db385219a00ae434d1f3fea43b18
Gabe Black [Tue, 28 Feb 2006 11:02:18 +0000 (06:02 -0500)]
Cleaned up and slightly reorganized the Fault class heirarchy.
arch/alpha/ev5.cc:
Changed c style casts of Faults to dynamic_casts
arch/alpha/faults.cc:
AlphaFault is now an abstract class.
arch/alpha/faults.hh:
AlphaFault is now an abstract class. Also, AlphaMachineCheckFault and AlphaAlignmentFault multiply inherit from both AlphaFault and from MachineCheckFault and AlignmentFault respectively. These classes get their name from the generic classes.
cpu/o3/alpha_cpu_impl.hh:
Changed a c style cast to a dynamic_cast for a Fault
sim/faults.hh:
All generic Fault classes are now abstract. Also, MachineCheckFault and AlignmentFault inherit FaultBase as a virtual base class to help resolve ambiguities when they are multiply inherited in ISA specific classes. The override the isMachineCheckFault and isAlignmentFault functions appropriately, and provide a standard name for these faults.
--HG--
extra : convert_revision :
2cb906708e3eaec4a12587484c09e50ed6ef88fc
Gabe Black [Tue, 28 Feb 2006 04:26:13 +0000 (23:26 -0500)]
Changed ev5_trap from a function of the execution context to a function of the fault. The actual function still resides in the execution context.
--HG--
extra : convert_revision :
56e33536cdd9079ace03896b85ea3c84b6eb4e57
Gabe Black [Mon, 27 Feb 2006 21:46:00 +0000 (16:46 -0500)]
Moved the _stat for MachineCheckFault and AlignmentFault into the isa specific classes to prevent instantiation of the generic classes.
--HG--
extra : convert_revision :
0378261342df008c2bf6d260295ef21b15f119a8
Gabe Black [Mon, 27 Feb 2006 21:27:01 +0000 (16:27 -0500)]
Got rid of the fault_addr function.
--HG--
extra : convert_revision :
deb54cd82db47abb6d9bac76e072f2a4b1c883b2
Kevin Lim [Mon, 27 Feb 2006 17:09:08 +0000 (12:09 -0500)]
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean
--HG--
extra : convert_revision :
97c345f0715a347ce34f9cabd994485f30f2e171
Kevin Lim [Mon, 27 Feb 2006 16:44:35 +0000 (11:44 -0500)]
Changes to put all the misc regs within the misc reg file. This includes the FPCR, Uniq, lock flag, lock addr, and IPRs.
They are now accessed by calling readMiscReg()/setMiscReg() on the XC. Old IPR accesses are supported by using readMiscRegWithEffect() and setMiscRegWithEffect() (names may change in the future).
arch/alpha/alpha_memory.cc:
Change accesses to IPR to go through the XC.
arch/alpha/ev5.cc:
Change accesses for IPRs to go through the misc regs.
arch/alpha/isa/decoder.isa:
Change accesses to IPRs to go through the misc regs. readIpr() and setIpr() are now changed to calls to readMiscRegWithEffect() and setMiscRegWithEffect().
arch/alpha/isa/fp.isa:
Change accesses to IPRs and Fpcr to go through the misc regs.
arch/alpha/isa/main.isa:
Add support for all misc regs being accessed through readMiscReg() and setMiscReg(). Instead of readUniq and readFpcr, they are replaced by calls with Uniq_DepTag and Fpcr_DepTag passed in as the register index.
arch/alpha/isa_traits.hh:
Change the MiscRegFile to a class that handles all accesses to MiscRegs, which in Alpha include the FPCR, Uniq, Lock Addr, Lock Flag, and IPRs.
Two flavors of accesses are supported: normal register reads/writes, and reads/writes with effect. The latter are basically the original read/write IPR functions, while the former are normal reads/writes.
The lock flag and lock addr registers are added to the dependence tags in order to support being accessed through the misc regs.
arch/alpha/stacktrace.cc:
cpu/simple/cpu.cc:
dev/sinic.cc:
Change accesses to the IPRs to go through the XC.
arch/alpha/vtophys.cc:
Change access to the IPR to go through the XC.
arch/isa_parser.py:
Change generation of code for control registers to use the readMiscReg and setMiscReg functions.
base/remote_gdb.cc:
Change accesses to the IPR to go through the XC.
cpu/exec_context.hh:
Use the miscRegs to access the lock addr, lock flag, and other misc registers.
cpu/o3/alpha_cpu.hh:
cpu/simple/cpu.hh:
Support interface for reading and writing misc registers, which replaces readUniq, readFpcr, readIpr, and their set functions.
cpu/o3/alpha_cpu_impl.hh:
Change accesses to the IPRs to go through the miscRegs.
For now comment out some of the accesses to the misc regs until the proxy exec context is completed.
cpu/o3/alpha_dyn_inst.hh:
Change accesses to misc regs to use readMiscReg and setMiscReg.
cpu/o3/alpha_dyn_inst_impl.hh:
Remove old misc reg accessors.
cpu/o3/cpu.cc:
Comment out old misc reg accesses until the proxy exec context is completed.
cpu/o3/cpu.hh:
Change accesses to the misc regs.
cpu/o3/regfile.hh:
Remove old access methods for the misc regs, replace them with readMiscReg and setMiscReg. They are dummy functions for now until the proxy exec context is completed.
kern/kernel_stats.cc:
kern/system_events.cc:
Have accesses to the IPRs go through the XC.
kern/tru64/tru64.hh:
Have accesses to the misc regs use the new access methods.
--HG--
extra : convert_revision :
e32e0a3fe99522e17294bbe106ff5591cb1a9d76
Gabe Black [Mon, 27 Feb 2006 11:05:10 +0000 (06:05 -0500)]
Renamed arch files to remove alpha prefix, and changed alpha_memory.hh and cc to a more accurate tlb.hh and cc
--HG--
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux_process.cc
rename : arch/alpha/alpha_linux_process.hh => arch/alpha/linux_process.hh
rename : arch/alpha/alpha_memory.cc => arch/alpha/tlb.cc
rename : arch/alpha/alpha_memory.hh => arch/alpha/tlb.hh
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64_process.cc
rename : arch/alpha/alpha_tru64_process.hh => arch/alpha/tru64_process.hh
extra : convert_revision :
9fe6863cc37347d2a6bd716c529b0a4a50b36ea7
Gabe Black [Mon, 27 Feb 2006 10:35:43 +0000 (05:35 -0500)]
Changed targetarch to just arch.
SConscript:
Changed all of the "targetarch" files to be "arch" files
arch/SConscript:
Added all of the remaining targetarch files to isa_switch_hdrs
--HG--
extra : convert_revision :
a37d18349e27cf92dce12814f21944daa7fe9480
Gabe Black [Mon, 27 Feb 2006 09:05:02 +0000 (04:05 -0500)]
Fixed up some include paths.
kern/kernel_stats.cc:
Replaced targetarch with arch/alpha, since osfpal.hh is not a targetarched file.
--HG--
extra : convert_revision :
24a25f27e5912cb949568cf5fd0ab856771ba0d1
Gabe Black [Mon, 27 Feb 2006 09:02:45 +0000 (04:02 -0500)]
Added isMachineCheckFault and isAlignmentFault virtual functions to the fault base class, and replaced the isA templated function with them where appropriate.
arch/alpha/ev5.cc:
cpu/simple/cpu.cc:
Changed from the isA templated function to isMachineCheckFault and isAlignmentFault
sim/faults.hh:
Added isMachineCheckFault and isAlignmentFault virtual functions to the fault base class.
--HG--
extra : convert_revision :
3bf3a4369bc24a039648ee4f2a9c1663362ff2e2
Gabe Black [Mon, 27 Feb 2006 09:00:24 +0000 (04:00 -0500)]
Put the Alpha faults into the AlphaISA namespace
--HG--
extra : convert_revision :
d9586bb8ffaab74673aa0b3d17bb676b949ff212
Gabe Black [Mon, 27 Feb 2006 08:57:15 +0000 (03:57 -0500)]
MachineCheckFaults and AlignmentFaults are now generated by the ISA, rather than being created directly.
arch/alpha/alpha_memory.cc:
cpu/base_dyn_inst.cc:
dev/alpha_console.cc:
dev/pcidev.hh:
dev/sinic.cc:
MachineCheckFaults are now generated by the ISA, rather than being created directly.
--HG--
extra : convert_revision :
34a7da41639e93be21ed70dac681b27480008d19
Gabe Black [Mon, 27 Feb 2006 06:38:47 +0000 (01:38 -0500)]
Changed targetarch to arch for isa_traits.hh include
--HG--
extra : convert_revision :
e7ae43d812140ec99b782394e54903153f8d0476
Gabe Black [Mon, 27 Feb 2006 06:32:49 +0000 (01:32 -0500)]
Where architecture independent sources included arch/alpha/xxx.hh, they were changed to include targetarch/xxx.hh
cpu/base_dyn_inst.cc:
cpu/o3/bpred_unit.hh:
cpu/o3/comm.hh:
cpu/o3/cpu.hh:
cpu/o3/regfile.hh:
cpu/ozone/cpu_impl.hh:
cpu/ozone/ea_list.cc:
cpu/ozone/ea_list.hh:
kern/kernel_stats.cc:
Changed arch/alpha to targetarch
sim/process.cc:
Changed arch/alpha to targetarch, and removed gaurding ifdef
--HG--
extra : convert_revision :
3c29e6baeb1cd900f7b5e11144a5d547a6c7c5ab
Nathan Binkert [Mon, 27 Feb 2006 04:06:21 +0000 (23:06 -0500)]
fix some minor stats stuff
util/stats/stats.py:
fix up a few of the stats.
--HG--
extra : convert_revision :
61c600cd146900c8cc0cf60a9036f2e999a5e244
Nathan Binkert [Mon, 27 Feb 2006 01:31:08 +0000 (20:31 -0500)]
add some support for random access of data in packet fifos
dev/pktfifo.cc:
add support for copying arbitrary data out of a
packet fifo
dev/pktfifo.hh:
add support for copying arbitrary data out of a
packet fifo.
Add functions to determine where in the fifo a
particular packet is
--HG--
extra : convert_revision :
f8ddc994ce8577f29af0de3fa418a01e4e2cb0f1
Nathan Binkert [Sun, 26 Feb 2006 15:44:01 +0000 (10:44 -0500)]
Allow graph_group to not be selected so we can have a
normal ungrouped barchart
--HG--
extra : convert_revision :
7d55440c9bb060607eddbb72448a3413944bb6ba
Nathan Binkert [Sun, 26 Feb 2006 06:00:15 +0000 (01:00 -0500)]
better function categorization
util/stats/categories.py:
bit more stuff for categorizing functions
--HG--
extra : convert_revision :
03617246a9254a580684dce82836517d1efdfc5b
Nathan Binkert [Sun, 26 Feb 2006 05:57:37 +0000 (00:57 -0500)]
fix small python bug in database processing code
util/stats/db.py:
fix usage of hasattr
--HG--
extra : convert_revision :
b384e1efeda76921c565f9f391694c27273edcec
Nathan Binkert [Sun, 26 Feb 2006 05:35:10 +0000 (00:35 -0500)]
code cleanup
util/stats/barchart.py:
clean up some of lisa's messy code
remove trailing whitespace while I'm at it.
--HG--
extra : convert_revision :
f2fe6777fb4b458fa1d5b5b743f6274014c229ad
Nathan Binkert [Sun, 26 Feb 2006 05:19:02 +0000 (00:19 -0500)]
forgot to add a chart option
util/stats/chart.py:
add a bool config option for determining
if the legend is inside or outside the figure
--HG--
extra : convert_revision :
e862d1832a0cc3c1837758cc247bc77c0a02ec12