diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-06-19 18:54:40 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-06-19 18:54:40 -0700 |
commit | 5c48a0581338226ee2f56a4ed99c6d68abb69613 (patch) | |
tree | f8d6e32036d4c58f69b48f60e5e5a6b3f1192b05 /src/arch/sparc/isa_traits.hh | |
parent | 053c715f213a6532b5644e46a5d04ef9e092139e (diff) | |
parent | debf04aef1b0f662e981507545cdac956dd22a47 (diff) | |
download | gem5-5c48a0581338226ee2f56a4ed99c6d68abb69613.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/newmem
into doughnut.hpl.hp.com:/home/gblack/newmem-o3-micro
src/cpu/base_dyn_inst_impl.hh:
src/cpu/o3/fetch_impl.hh:
Hand merge
--HG--
extra : convert_revision : 0c0692033ac30133672d8dfe1f1a27e9d9e95a3d
Diffstat (limited to 'src/arch/sparc/isa_traits.hh')
-rw-r--r-- | src/arch/sparc/isa_traits.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh index d0b8827f3..8b3ec36a6 100644 --- a/src/arch/sparc/isa_traits.hh +++ b/src/arch/sparc/isa_traits.hh @@ -58,7 +58,7 @@ namespace SparcISA // These enumerate all the registers for dependence tracking. enum DependenceTags { - FP_Base_DepTag = 32*3+8, + FP_Base_DepTag = 32*3+9, Ctrl_Base_DepTag = FP_Base_DepTag + 64 }; |