diff options
author | 2015-12-13 11:23:55 +0100 | |
---|---|---|
committer | 2015-12-13 11:23:55 +0100 | |
commit | 4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch) | |
tree | df0e1d28daa79b9151088498a933cd1fc37c9c07 /src/devices/cpu/uml.cpp | |
parent | 1cda42b22e591965ee69561fcf52272bd991b3b2 (diff) | |
parent | 14d5966a379e9783ba724750a5f84a72af62cadc (diff) |
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/cpu/uml.cpp')
-rw-r--r-- | src/devices/cpu/uml.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/cpu/uml.cpp b/src/devices/cpu/uml.cpp index f7b0584431f..e01b34cdcb6 100644 --- a/src/devices/cpu/uml.cpp +++ b/src/devices/cpu/uml.cpp @@ -256,12 +256,12 @@ inline UINT64 rol64(UINT64 source, UINT8 count) uml::code_handle::code_handle(drcuml_state &drcuml, const char *name) : m_code(reinterpret_cast<drccodeptr *>(drcuml.cache().alloc_near(sizeof(drccodeptr)))), m_string(name), - m_next(NULL), + m_next(nullptr), m_drcuml(drcuml) { - if (m_code == NULL) + if (m_code == nullptr) throw std::bad_alloc(); - *m_code = NULL; + *m_code = nullptr; } @@ -271,7 +271,7 @@ uml::code_handle::code_handle(drcuml_state &drcuml, const char *name) void uml::code_handle::set_codeptr(drccodeptr code) { - assert(*m_code == NULL); + assert(*m_code == nullptr); assert_in_cache(m_drcuml.cache(), code); *m_code = code; } @@ -972,7 +972,7 @@ const char *uml::instruction::disasm(std::string &buffer, drcuml_state *drcuml) UINT32 symoffset; // symbol - if (drcuml != NULL && (symbol = drcuml->symbol_find(param.memory(), &symoffset)) != NULL) + if (drcuml != nullptr && (symbol = drcuml->symbol_find(param.memory(), &symoffset)) != nullptr) { if (symoffset == 0) strcatprintf(buffer, "[%s]", symbol); @@ -981,7 +981,7 @@ const char *uml::instruction::disasm(std::string &buffer, drcuml_state *drcuml) } // cache memory - else if (drcuml != NULL && drcuml->cache().contains_pointer(param.memory())) + else if (drcuml != nullptr && drcuml->cache().contains_pointer(param.memory())) strcatprintf(buffer, "[+$%X]", (UINT32)(FPTR)((drccodeptr)param.memory() - drcuml->cache().near())); // general memory |