diff options
author | 2015-05-02 19:41:03 +0200 | |
---|---|---|
committer | 2015-05-02 19:41:03 +0200 | |
commit | cc3b682e52bf097d31db78032aad01d6a0b12e94 (patch) | |
tree | 860c97ca011b64c31a5ad277f5cea2b1d86eeaf0 /src/emu/debug/dvmemory.c | |
parent | 7df6a23ba2ae1c1df94ed8cc2398f2546f339997 (diff) | |
parent | a649a95488e1fc85813dda747dc74c596496bd1c (diff) |
Merge pull request #1 from mamedev/master
Sync to master
Diffstat (limited to 'src/emu/debug/dvmemory.c')
-rw-r--r-- | src/emu/debug/dvmemory.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/debug/dvmemory.c b/src/emu/debug/dvmemory.c index 7ccea671324..a81e032ce48 100644 --- a/src/emu/debug/dvmemory.c +++ b/src/emu/debug/dvmemory.c @@ -127,7 +127,7 @@ void debug_view_memory::enumerate_sources() { // start with an empty list m_source_list.reset(); - astring name; + std::string name; // first add all the devices' address spaces memory_interface_iterator iter(machine().root_device()); @@ -137,14 +137,14 @@ void debug_view_memory::enumerate_sources() if (memintf->has_space(spacenum)) { address_space &space = memintf->space(spacenum); - name.printf("%s '%s' %s space memory", memintf->device().name(), memintf->device().tag(), space.name()); + strprintf(name,"%s '%s' %s space memory", memintf->device().name(), memintf->device().tag(), space.name()); m_source_list.append(*global_alloc(debug_view_memory_source(name.c_str(), space))); } // then add all the memory regions for (memory_region *region = machine().memory().first_region(); region != NULL; region = region->next()) { - name.printf("Region '%s'", region->name()); + strprintf(name, "Region '%s'", region->name()); m_source_list.append(*global_alloc(debug_view_memory_source(name.c_str(), *region))); } @@ -162,7 +162,7 @@ void debug_view_memory::enumerate_sources() // also, don't trim the front of the name, it's important to know which VIA6522 we're looking at, e.g. if (strncmp(itemname, "timer/", 6)) { - name.cpy(itemname); + name.assign(itemname); m_source_list.append(*global_alloc(debug_view_memory_source(name.c_str(), base, valsize, valcount))); } } @@ -451,14 +451,14 @@ void debug_view_memory::recompute() else { m_maxaddr = source.m_length - 1; - addrchars = m_addrformat.printf("%X", m_maxaddr); + addrchars = strprintf(m_addrformat, "%X", m_maxaddr); } // generate an 8-byte aligned format for the address if (!m_reverse_view) - m_addrformat.printf("%*s%%0%dX", 8 - addrchars, "", addrchars); + strprintf(m_addrformat, "%*s%%0%dX", 8 - addrchars, "", addrchars); else - m_addrformat.printf("%%0%dX%*s", addrchars, 8 - addrchars, ""); + strprintf(m_addrformat, "%%0%dX%*s", addrchars, 8 - addrchars, ""); // if we are viewing a space with a minimum chunk size, clamp the bytes per chunk if (source.m_space != NULL && source.m_space->byte_to_address(1) > 1) |