oops (nw)

This commit is contained in:
Olivier Galibert 2015-01-25 21:35:36 +01:00
parent b15b425118
commit f2a9d4e90a
4 changed files with 5 additions and 5 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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); }