derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge zizzer:/bk/newmem

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

--HG--
extra : convert_revision : 2398e48722dd71ddf270e93bd7b387078fb30e6b
This commit is contained in:
Gabe Black
2007-01-28 14:46:56 -05:00
parent 0358ccee23 37795b104d
commit 91ca1b48e2
14 changed files with 88 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/base/compiler.hh
View File

@@ -44,7 +44,8 @@
// this doesn't do anything with sun cc, but why not
#define M5_ATTR_NORETURN __sun_attr__((__noreturn__))
#define M5_DUMMY_RETURN return (0);
#define M5_PRAGMA_NORETURN(x) _Pragma("does_not_return(x)")
#define DO_PRAGMA(x) _Pragma(#x)
#define M5_PRAGMA_NORETURN(x) DO_PRAGMA(does_not_return(x))
#else
#error "Need to define compiler options in base/compiler.hh"
#endif

22
src/base/cprintf_formats.hh
View File

@@ -84,21 +84,21 @@ _format_integer(std::ostream &out, const T &data, Format &fmt)
switch (fmt.base) {
case Format::hex:
out.setf(ios::hex, ios::basefield);
out.setf(std::ios::hex, std::ios::basefield);
break;
case Format::oct:
out.setf(ios::oct, ios::basefield);
out.setf(std::ios::oct, std::ios::basefield);
break;
case Format::dec:
out.setf(ios::dec, ios::basefield);
out.setf(std::ios::dec, std::ios::basefield);
break;
}
if (fmt.alternate_form) {
if (!fmt.fill_zero)
out.setf(ios::showbase);
out.setf(std::ios::showbase);
else {
switch (fmt.base) {
case Format::hex:
@@ -122,13 +122,13 @@ _format_integer(std::ostream &out, const T &data, Format &fmt)
out.width(fmt.width);
if (fmt.flush_left && !fmt.fill_zero)
out.setf(ios::left);
out.setf(std::ios::left);
if (fmt.print_sign)
out.setf(ios::showpos);
out.setf(std::ios::showpos);
if (fmt.uppercase)
out.setf(ios::uppercase);
out.setf(std::ios::uppercase);
out << data;
}
@@ -148,7 +148,7 @@ _format_float(std::ostream &out, const T &data, Format &fmt)
if (fmt.precision == 0)
fmt.precision = 1;
else
out.setf(ios::scientific);
out.setf(std::ios::scientific);
out.precision(fmt.precision);
} else
@@ -156,7 +156,7 @@ _format_float(std::ostream &out, const T &data, Format &fmt)
out.width(fmt.width);
if (fmt.uppercase)
out.setf(ios::uppercase);
out.setf(std::ios::uppercase);
break;
case Format::fixed:
@@ -164,7 +164,7 @@ _format_float(std::ostream &out, const T &data, Format &fmt)
if (fmt.width > 0)
out.width(fmt.width);
out.setf(ios::fixed);
out.setf(std::ios::fixed);
out.precision(fmt.precision);
} else
if (fmt.width > 0)
@@ -216,7 +216,7 @@ _format_string(std::ostream &out, const T &data, Format &fmt)
if (fmt.width > 0)
out.width(fmt.width);
if (fmt.flush_left)
out.setf(ios::left);
out.setf(std::ios::left);
out << data;
#endif

2
src/base/statistics.hh
View File

@@ -398,7 +398,7 @@ class Wrap : public Child
public:
Wrap()
{
map(new Data<Child>(*this));
this->map(new Data<Child>(*this));
}
/**