From f2a9d4e90a024a97d8f180ac9f790236e3b3c80c Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 25 Jan 2015 21:35:36 +0100 Subject: oops (nw) --- src/emu/cpu/mips/mips3drc.c | 2 +- src/emu/cpu/powerpc/ppcdrc.c | 4 ++-- src/emu/cpu/rsp/rspdrc.c | 2 +- src/lib/util/astring.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/emu/cpu/mips/mips3drc.c b/src/emu/cpu/mips/mips3drc.c index 94036cbb919..effe2154468 100644 --- a/src/emu/cpu/mips/mips3drc.c +++ b/src/emu/cpu/mips/mips3drc.c @@ -1013,7 +1013,7 @@ void mips3_device::generate_update_mode(drcuml_block *block) an exception if out -------------------------------------------------*/ -void mips3_device::generate_update_cycles(drcuml_block *block, compiler_state *compiler, parameter param, int allow_exception) +void mips3_device::generate_update_cycles(drcuml_block *block, compiler_state *compiler, uml::parameter param, int allow_exception) { /* check software interrupts if pending */ if (compiler->checksoftints) diff --git a/src/emu/cpu/powerpc/ppcdrc.c b/src/emu/cpu/powerpc/ppcdrc.c index 61037b8de9a..561dec685bf 100644 --- a/src/emu/cpu/powerpc/ppcdrc.c +++ b/src/emu/cpu/powerpc/ppcdrc.c @@ -57,7 +57,7 @@ extern offs_t ppc_dasm_one(char *buffer, UINT32 pc, UINT32 op); ***************************************************************************/ #define R32(reg) m_regmap[reg] -#define R32Z(reg) (((reg) == 0) ? parameter(0) : m_regmap[reg]) +#define R32Z(reg) (((reg) == 0) ? uml::parameter(0) : m_regmap[reg]) #define F64(reg) m_fdregmap[reg] #define CR32(reg) mem(&m_core->cr[reg]) #define FPSCR32 mem(&m_core->fpscr) @@ -1549,7 +1549,7 @@ void ppc_device::generate_update_mode(drcuml_block *block) an exception if out -------------------------------------------------*/ -void ppc_device::generate_update_cycles(drcuml_block *block, compiler_state *compiler, parameter param, int allow_exception) +void ppc_device::generate_update_cycles(drcuml_block *block, compiler_state *compiler, uml::parameter param, int allow_exception) { /* check full interrupts if pending */ if (compiler->checkints) diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c index 44a0a22542a..f684717f7d4 100644 --- a/src/emu/cpu/rsp/rspdrc.c +++ b/src/emu/cpu/rsp/rspdrc.c @@ -641,7 +641,7 @@ void rsp_device::static_generate_memory_accessor(int size, int iswrite, const ch subtract cycles from the icount and generate an exception if out -------------------------------------------------*/ -void rsp_device::generate_update_cycles(drcuml_block *block, compiler_state *compiler, parameter param, int allow_exception) +void rsp_device::generate_update_cycles(drcuml_block *block, compiler_state *compiler, uml::parameter param, int allow_exception) { /* account for cycles */ if (compiler->cycles > 0) diff --git a/src/lib/util/astring.h b/src/lib/util/astring.h index 639591e04f2..0851aa0c006 100644 --- a/src/lib/util/astring.h +++ b/src/lib/util/astring.h @@ -32,7 +32,7 @@ public: ~astring(); // construction with copy - astring(const char *string) { init().cpy(string); } + astring(const char *string) { init(); if(string) cpy(string); } astring(const char *string, int length) { init().cpy(string, length); } astring(const char *str1, const char *str2) { init().cpy(str1).cat(str2); } astring(const char *str1, const char *str2, const char *str3) { init().cpy(str1).cat(str2).cat(str3); } -- cgit v1.2.3