diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-09 15:15:55 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-09 15:15:55 -0500 |
| commit | 91545ac2bf5ac47ecbfc403ef6e2b2ce340ae551 (patch) | |
| tree | c01c598d48d60de1c4097d905430b44b9647e224 /arch/sparc | |
| parent | 77e40756b723e6cf18462bbb15653792b5c90346 (diff) | |
| parent | e30bce8f8e4fdb3dbf4f8161f496c94c85d3d8cf (diff) | |
| download | gem5-91545ac2bf5ac47ecbfc403ef6e2b2ce340ae551.tar.xz | |
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
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/isa_traits.hh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/isa_traits.hh b/arch/sparc/isa_traits.hh index c592a05ed..1752ed194 100644 --- a/arch/sparc/isa_traits.hh +++ b/arch/sparc/isa_traits.hh @@ -409,6 +409,7 @@ namespace SparcISA Addr pc; // Program Counter Addr npc; // Next Program Counter + Addr nnpc; void serialize(std::ostream &os); void unserialize(Checkpoint *cp, const std::string §ion); |