Merge zizzer:/bk/newmem

into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : f4a05accb8fa24d425dd818b1b7f268378180e99

diff --cc configs/example/fs.py
index d479d717eee948de7da6c4c0169b937aedc6b1e4,5d7d4961696a5096e9e1f3bac2d4e26540b5ad27..b878f2bd482d5b506c3b6c313a183c444a5702f8
--- 1/configs/example/fs.py
--- 2/configs/example/fs.py
+++ b/configs/example/fs.py
@@@ -1,4 -1,4 +1,4 @@@
--# Copyright (c) 2006 The Regents of The University of Michigan
++# Copyright (c) 2006-2007 The Regents of The University of Michigan
  # All rights reserved.
  #
  # Redistribution and use in source and binary forms, with or without

diff --cc src/SConscript
Simple merge

diff --cc src/arch/sparc/isa/decoder.isa
index e8578291c48bd1d07b32ac9d468c2a4a22261437,e2bebd987111c46eb9d0267903a9fa264b242770..8abaf10077a62aea093621133e31c14f25a34d4e
--- 1/src/arch/sparc/isa/decoder.isa
--- 2/src/arch/sparc/isa/decoder.isa
+++ b/src/arch/sparc/isa/decoder.isa
@@@ -1,4 -1,4 +1,4 @@@
--// Copyright (c) 2006 The Regents of The University of Michigan
++// Copyright (c) 2006-2007 The Regents of The University of Michigan
  // All rights reserved.
  //
  // Redistribution and use in source and binary forms, with or without

diff --cc src/arch/sparc/isa/formats/mem/blockmem.isa
index c4f052f98d33094578faccfa5d15e5d99b85766e,5d05dad0377c964a0e07404776789cb5bf32879e..62ac4b43adcc46b7f173b736bde78d9e2156e2cb
--- 1/src/arch/sparc/isa/formats/mem/blockmem.isa
--- 2/src/arch/sparc/isa/formats/mem/blockmem.isa
+++ b/src/arch/sparc/isa/formats/mem/blockmem.isa
@@@ -1,4 -1,4 +1,4 @@@
--// Copyright (c) 2006 The Regents of The University of Michigan
++// Copyright (c) 2006-2007 The Regents of The University of Michigan
  // All rights reserved.
  //
  // Redistribution and use in source and binary forms, with or without

diff --cc src/arch/sparc/isa/formats/mem/util.isa
index c56821c4f0ad8ac085e7b281f57a27158085582e,b6e0945b74bb3ba449e47c9e01def67d14087569..5bb4e1fe6458b36772951c0c8a33134d85c3939c
--- 1/src/arch/sparc/isa/formats/mem/util.isa
--- 2/src/arch/sparc/isa/formats/mem/util.isa
+++ b/src/arch/sparc/isa/formats/mem/util.isa
@@@ -1,4 -1,4 +1,4 @@@
--// Copyright (c) 2006 The Regents of The University of Michigan
++// Copyright (c) 2006-2007 The Regents of The University of Michigan
  // All rights reserved.
  //
  // Redistribution and use in source and binary forms, with or without

diff --cc src/cpu/exetrace.cc
index 98e75d83aa8b2de80c0c1ac832d1e6e28de81270,352a119586bfd536099eac4d559b7af7d258f072..378fcd09b0ab1d56d600ebaec43f23f9c28f5783
--- 1/src/cpu/exetrace.cc
--- 2/src/cpu/exetrace.cc
+++ b/src/cpu/exetrace.cc
@@@ -391,24 -386,23 +392,31 @@@ Trace::InstRecord::dump(ostream &outs
                          diffPil = true;
                      if(shared_data->cwp != thread->readMiscReg(MISCREG_CWP))
                          diffCwp = true;
 -                    if(shared_data->cansave != thread->readMiscReg(MISCREG_CANSAVE))
 +                    //if(shared_data->cansave != thread->readMiscReg(MISCREG_CANSAVE))
 +                    if(shared_data->cansave !=
 +                            thread->readIntReg(NumIntArchRegs + 3))
                          diffCansave = true;
 +                    //if(shared_data->canrestore !=
 +                    //            thread->readMiscReg(MISCREG_CANRESTORE))
                      if(shared_data->canrestore !=
 -                            thread->readMiscReg(MISCREG_CANRESTORE))
 +                            thread->readMiscReg(NumIntArchRegs + 4))
                          diffCanrestore = true;
 -                    if(shared_data->otherwin != thread->readMiscReg(MISCREG_OTHERWIN))
 +                    //if(shared_data->otherwin != thread->readMiscReg(MISCREG_OTHERWIN))
 +                    if(shared_data->otherwin !=
 +                            thread->readIntReg(NumIntArchRegs + 5))
                          diffOtherwin = true;
 -                    if(shared_data->cleanwin != thread->readMiscReg(MISCREG_CLEANWIN))
 +                    //if(shared_data->cleanwin != thread->readMiscReg(MISCREG_CLEANWIN))
 +                    if(shared_data->cleanwin !=
 +                            thread->readMiscReg(NumIntArchRegs + 6))
                          diffCleanwin = true;
  
+                     for (int i = 0; i < 64; i++) {
+                         if (shared_data->itb[i] !=  thread->getITBPtr()->TteRead(i))
+                                 diffTlb = true;
+                         if (shared_data->dtb[i] !=  thread->getDTBPtr()->TteRead(i))
+                                 diffTlb = true;
+                     }
+ 
                      if ((diffPC || diffCC || diffInst || diffRegs || diffTpc ||
                              diffTnpc || diffTstate || diffTt || diffHpstate ||
                              diffHtstate || diffHtba || diffPstate || diffY ||

diff --cc src/cpu/m5legion_interface.h
index bfb88485a5ed5725e4b1e9d8981c99f72a82f7f0,c3ba5986e8ded723787d7bfabff98ae7f4ebfc70..4cb270e66935733c6b41e5cd08fc8f3ce6dd0c3c
--- 1/src/cpu/m5legion_interface.h
--- 2/src/cpu/m5legion_interface.h
+++ b/src/cpu/m5legion_interface.h
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * Copyright (c) 2006 The Regents of The University of Michigan
++ * Copyright (c) 2006-2007 The Regents of The University of Michigan
   * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without

diff --cc src/cpu/o3/commit_impl.hh
Simple merge

diff --cc src/cpu/o3/cpu.cc
Simple merge

diff --cc src/cpu/o3/decode_impl.hh
Simple merge

diff --cc src/cpu/o3/fetch_impl.hh
Simple merge

diff --cc src/cpu/o3/iew_impl.hh
Simple merge

diff --cc src/cpu/o3/lsq_unit.hh
Simple merge

diff --cc src/cpu/o3/rename_impl.hh
Simple merge

diff --cc src/unittest/Makefile
index 1f0584066466c8e284e39ba34a83bf8d094b17d9,0c11b9563659ac4a453c37d519cb9ec5852b501b..e22b80b4898c626babf29a7659f9f9ccea6761d3
--- 1/src/unittest/Makefile
--- 2/src/unittest/Makefile
+++ b/src/unittest/Makefile
@@@ -1,4 -1,4 +1,4 @@@
--# Copyright (c) 2006 The Regents of The University of Michigan
++# Copyright (c) 2006-2007 The Regents of The University of Michigan
  # All rights reserved.
  #
  # Redistribution and use in source and binary forms, with or without