diff options
author | 2018-03-23 11:28:51 +1100 | |
---|---|---|
committer | 2018-03-23 12:17:53 +1100 | |
commit | 44c7da0cf5609188f67fd146329c44236f344493 (patch) | |
tree | 03ee9ea420bf93bf75468e7a76ba7d1339136ede /src/devices/cpu/e132xs/e132xsdrc.cpp | |
parent | 3be74a07a89d94b6af8d42a7e3032bccea51ddb0 (diff) |
Make UML shorthand a bit easier to use without using namespace everywhere, clean up a bit of macro hell in PowerPC core
Diffstat (limited to 'src/devices/cpu/e132xs/e132xsdrc.cpp')
-rw-r--r-- | src/devices/cpu/e132xs/e132xsdrc.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/devices/cpu/e132xs/e132xsdrc.cpp b/src/devices/cpu/e132xs/e132xsdrc.cpp index 1b198470e6a..81bfe7505c5 100644 --- a/src/devices/cpu/e132xs/e132xsdrc.cpp +++ b/src/devices/cpu/e132xs/e132xsdrc.cpp @@ -6,10 +6,8 @@ #include "e132xsfe.h" #include "32xsdefs.h" -using namespace uml; - -#define DRC_PC mem(m_core->global_regs) -#define DRC_SR mem(&m_core->global_regs[1]) +#define DRC_PC uml::mem(m_core->global_regs) +#define DRC_SR uml::mem(&m_core->global_regs[1]) void hyperstone_device::execute_run_drc() { @@ -331,7 +329,7 @@ static inline uint32_t epc(const opcode_desc *desc) already allocated -------------------------------------------------*/ -static inline void alloc_handle(drcuml_state *drcuml, code_handle **handleptr, const char *name) +static inline void alloc_handle(drcuml_state *drcuml, uml::code_handle **handleptr, const char *name) { if (*handleptr == nullptr) *handleptr = drcuml->handle_alloc(name); @@ -346,7 +344,7 @@ static inline void alloc_handle(drcuml_state *drcuml, code_handle **handleptr, c void hyperstone_device::static_generate_exception(uint32_t exception, const char *name) { - code_handle *&exception_handle = m_exception[exception]; + uml::code_handle *&exception_handle = m_exception[exception]; drcuml_state *drcuml = m_drcuml.get(); drcuml_block *block = drcuml->begin_block(1024); @@ -512,7 +510,7 @@ void hyperstone_device::static_generate_out_of_cycles() static_generate_memory_accessor ------------------------------------------------------------------*/ -void hyperstone_device::static_generate_memory_accessor(int size, int iswrite, bool isio, const char *name, code_handle *&handleptr) +void hyperstone_device::static_generate_memory_accessor(int size, int iswrite, bool isio, const char *name, uml::code_handle *&handleptr) { /* on entry, address is in I0; data for writes is in I1 */ /* on exit, read result is in I1 */ |