Merge zeep.pool:/z/saidi/work/m5.newmem

into  zeep.pool:/z/saidi/work/m5.suncc

--HG--
extra : convert_revision : 20f61a524a3b53fc0afcf53a24b5a1fe1d96f579

diff --cc src/arch/sparc/isa/decoder.isa
Simple merge

diff --cc src/arch/sparc/isa/includes.isa
index 0c112d481a3a6528dde3068bceb43372701304b7,688f26d5cf07350d2de2f82a5fe6cd62281659c1..5d90fbdd2ef90575da449ce2d3c7b310ab9895df
--- 1/src/arch/sparc/isa/includes.isa
--- 2/src/arch/sparc/isa/includes.isa
+++ b/src/arch/sparc/isa/includes.isa
@@@ -63,8 -64,8 +64,9 @@@ output exec {
  #if defined(linux)
  #include <fenv.h>
  #endif
 +#include <limits>
  
+ #include <cmath>
  #include "arch/sparc/asi.hh"
  #include "cpu/base.hh"
  #include "cpu/exetrace.hh"

diff --cc src/arch/sparc/isa_traits.hh
Simple merge

diff --cc src/arch/sparc/tlb.cc
Simple merge

diff --cc src/base/loader/object_file.cc
index da5aa9552e0a3b8d928f31fbeb7ab1d34217b2b5,2273b6c4e9d1586c8222ef7feda91562cb7358dd..7424b9305d19aa2b6ebe92658f45c41ef7ebe2e0
--- 1/src/base/loader/object_file.cc
--- 2/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@@ -147,12 -147,6 +147,12 @@@ createObjectFile(const string &fname, b
  
      // don't know what it is
      close(fd);
-     munmap(fileData, len);
+     munmap((char*)fileData, len);
      return NULL;
  }
 +
 +bool
 +ObjectFile::isDynamic()
 +{
 +    return false;
 +}

diff --cc src/sim/byteswap.hh
Simple merge