christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Merge "util: hex and octal number support for MemoryMap"

Browse Source
This commit is contained in:
Tobias Stumpf
2014-09-29 16:07:31 +02:00
committed by Gerrit Code Review
parent 6d3ab14365 744ae1b7d7
commit 2d1b19ea0f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/util/MemoryMap.cc
View File

@ -19,11 +19,15 @@ bool MemoryMap::readFromFile(char const * const filename)
unsigned count = 0; unsigned count = 0;
while (getline(file, buf)) { while (getline(file, buf)) {
std::string addr, len;
std::stringstream ss(buf, std::ios::in); std::stringstream ss(buf, std::ios::in);
ss >> guest_addr >> guest_len; ss >> addr >> len;
guest_addr = strtoul(addr.c_str(), NULL, 0);
guest_len = strtoul(len.c_str(), NULL, 0);
add(guest_addr, guest_len); add(guest_addr, guest_len);
count++; count++;
} }
// assertion kept from original code; usually something's fishy if the file // assertion kept from original code; usually something's fishy if the file
// contains no entries // contains no entries
assert(count > 0); assert(count > 0);