sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5

Browse source 
into zizzer.eecs.umich.edu:/.automount/zans/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 3134761fa4c572a672558dfb6f9252aaef7b7062
This commit is contained in:
Nathan Binkert 2003-10-31 18:28:05 -05:00
parent 60da271e1d 5341e1aa9e
commit 166def1f56
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
base/str.cc
View file

@ -74,25 +74,31 @@ tokenize(vector<string>& v, const string &s, char token, bool ignore)
v.push_back(s.substr(first)); v.push_back(s.substr(first));
} }
/**
* @todo This function will not handle the smallest negative decimal
* value for a signed type
*/
template <class T> template <class T>
inline bool inline bool
__to_number(string value, T &retval) __to_number(string value, T &retval)
{ {
static const T maxnum = ((T)-1); static const T maxnum = ((T)-1);
static const bool sign = maxnum < 0; static const bool sign = maxnum < 0;
static const T hexmax = maxnum & (((T)1 << (sizeof(T) * 8 - 4)) - 1); static const int bits = sizeof(T) * 8;
static const T octmax = maxnum & (((T)1 << (sizeof(T) * 8 - 3)) - 1); static const T hexmax = maxnum & (((T)1 << (bits - 4 - sign)) - 1);
static const T octmax = maxnum & (((T)1 << (bits - 3 - sign)) - 1);
static const T signmax = static const T signmax =
(sign) ? maxnum & (((T)1 << (sizeof(T) * 8 - 1)) - 1) : maxnum; (sign) ? maxnum & (((T)1 << (bits - 1)) - 1) : maxnum;
static const T decmax = signmax / 10 - 1; static const T decmax = signmax / 10;
#if 0 #if 0
cout << "maxnum = 0x" << hex << maxnum << "\n" cout << "maxnum = 0x" << hex << (unsigned long long)maxnum << "\n"
<< "sign = 0x" << hex << sign << "\n" << "sign = 0x" << hex << (unsigned long long)sign << "\n"
<< "hexmax = 0x" << hex << hexmax << "\n" << "hexmax = 0x" << hex << (unsigned long long)hexmax << "\n"
<< "octmax = 0x" << hex << octmax << "\n" << "octmax = 0x" << hex << (unsigned long long)octmax << "\n"
<< "signmax = 0x" << hex << signmax << "\n" << "signmax = 0x" << hex << (unsigned long long)signmax << "\n"
<< "decmax = 0x" << hex << decmax << "\n"; << "decmax = 0x" << hex << (unsigned long long)decmax << "\n";
#endif #endif
eat_white(value); eat_white(value);
@ -180,8 +186,10 @@ __to_number(string value, T &retval)
goto multiply; goto multiply;
if (retval > decmax) return false; if (retval > decmax) return false;
bool atmax = retval == decmax;
retval *= 10; retval *= 10;
retval += c - '0'; retval += c - '0';
if (atmax && retval < decmax) return false;
if (sign && (retval & ((T)1 << (sizeof(T) * 8 - 1)))) if (sign && (retval & ((T)1 << (sizeof(T) * 8 - 1))))
return false; return false;
} }
@ -190,8 +198,10 @@ __to_number(string value, T &retval)
if (IsDec(c)) { if (IsDec(c)) {
if (retval > decmax) return false; if (retval > decmax) return false;
bool atmax = retval == decmax;
retval *= 10; retval *= 10;
retval += c - '0'; retval += c - '0';
if (atmax && retval < decmax) return false;
if (sign && negative) { if (sign && negative) {
if ((retval & ((T)1 << (sizeof(T) * 8 - 1))) && if ((retval & ((T)1 << (sizeof(T) * 8 - 1))) &&
retval >= (T)-signmax) retval >= (T)-signmax)

2
test/strnumtest.cc
View file

@ -33,6 +33,8 @@
#include "base/str.hh" #include "base/str.hh"
using namespace std;
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {