From: Ali Saidi <saidi@eecs.umich.edu>
Date: Wed, 7 Mar 2007 20:04:44 +0000 (-0500)
Subject: Merge zizzer:/bk/newmem
X-Git-Tag: m5_2.0_beta3~130^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=49527ab55312bf02dfce20c45db8f173b0c2324e;p=gem5.git

Merge zizzer:/bk/newmem
into  zeep.pool:/tmp/newmem

--HG--
extra : convert_revision : f078a05729b5fe464a06a58bc4adcb374f560572
---

49527ab55312bf02dfce20c45db8f173b0c2324e
diff --cc src/arch/x86/miscregfile.cc
index 3d645644f,287655a97..14ba3c7cc
--- a/src/arch/x86/miscregfile.cc
+++ b/src/arch/x86/miscregfile.cc
@@@ -100,10 -100,10 +100,10 @@@ string X86ISA::getMiscRegName(RegIndex 
  
  void MiscRegFile::clear()
  {
 -    panic("No misc registers in x86 yet!\n");
 +    //When there are actually misc regs implemented, this will clear them
  }
  
- MiscReg MiscRegFile::readReg(int miscReg)
+ MiscReg MiscRegFile::readRegNoEffect(int miscReg)
  {
      panic("No misc registers in x86 yet!\n");
  }