From f7f5decf3218b6dc00ae3ddf0f746b6764eef8b3 Mon Sep 17 00:00:00 2001 From: Ville Linde Date: Sat, 17 Dec 2016 23:10:45 +0200 Subject: [PATCH] fix mingw compile (nw) --- src/devices/cpu/mb86235/mb86235.h | 8 +++--- src/devices/cpu/mb86235/mb86235drc.cpp | 34 +++++++++++++------------- src/devices/cpu/mb86235/mb86235fe.cpp | 16 ++++++------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/devices/cpu/mb86235/mb86235.h b/src/devices/cpu/mb86235/mb86235.h index b189b9ab5ab..0488fa26c88 100644 --- a/src/devices/cpu/mb86235/mb86235.h +++ b/src/devices/cpu/mb86235/mb86235.h @@ -171,9 +171,6 @@ private: mb86235_internal_state *m_core; - drc_cache m_cache; - std::unique_ptr m_drcuml; - std::unique_ptr m_drcfe; uml::parameter m_regmap[32]; uml::code_handle *m_entry; /* entry point */ @@ -191,6 +188,9 @@ private: address_space_config m_program_config; address_space_config m_dataa_config; address_space_config m_datab_config; + drc_cache m_cache; + std::unique_ptr m_drcuml; + std::unique_ptr m_drcfe; address_space *m_program; address_space *m_dataa; @@ -235,7 +235,7 @@ private: uml::parameter get_alu1_input(int reg); uml::parameter get_alu_output(int reg); uml::parameter get_mul1_input(int reg); - void generate_condition(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, int cc, bool not, uml::code_label skip_label, bool condtemp); + void generate_condition(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, int cc, bool n, uml::code_label skip_label, bool condtemp); void generate_branch_target(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, int type, int ef2); bool has_register_clash(const opcode_desc *desc, int outreg); bool aluop_has_result(int aluop); diff --git a/src/devices/cpu/mb86235/mb86235drc.cpp b/src/devices/cpu/mb86235/mb86235drc.cpp index cd0f8e07030..86d85aca4cd 100644 --- a/src/devices/cpu/mb86235/mb86235drc.cpp +++ b/src/devices/cpu/mb86235/mb86235drc.cpp @@ -355,7 +355,7 @@ void mb86235_device::compile_block(offs_t pc) void mb86235_device::static_generate_entry_point() { - code_label skip = 1; + //code_label skip = 1; drcuml_block *block; /* begin generating */ @@ -1404,65 +1404,65 @@ void mb86235_device::generate_branch_target(drcuml_block *block, compiler_state } -void mb86235_device::generate_condition(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, int cc, bool not, uml::code_label skip_label, bool condtemp) +void mb86235_device::generate_condition(drcuml_block *block, compiler_state *compiler, const opcode_desc *desc, int cc, bool n, uml::code_label skip_label, bool condtemp) { switch (cc) { case 0x00: // MN UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_MN, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x01: // MZ UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_MZ, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x02: // MV UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_MV, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x03: // MU UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_MU, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x04: // ZD UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_ZD, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x05: // NR UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_NR, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x06: // IL UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_IL, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x07: // ZC UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_ZC, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x08: // AN UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_AN, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x09: // AZ UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_AZ, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x0a: // AV UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_AV, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x0b: // AU UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_AU, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x0c: // MD UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_MD, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; case 0x0d: // AD UML_CMP(block, condtemp ? mem(&m_core->condtemp) : FLAGS_AD, 0); - UML_JMPc(block, not ? COND_NE : COND_E, skip_label); + UML_JMPc(block, n ? COND_NE : COND_E, skip_label); break; default: fatalerror("generate_condition: unimplemented cc %02X at %08X", cc, desc->pc); @@ -1477,7 +1477,7 @@ void mb86235_device::generate_control(drcuml_block *block, compiler_state *compi int ef1 = (op >> 16) & 0x3f; int ef2 = op & 0xffff; int cop = (op >> 22) & 0x1f; - int rel12 = (op & 0x800) ? (0xfffff000 | (op & 0xfff)) : (op & 0xfff); +// int rel12 = (op & 0x800) ? (0xfffff000 | (op & 0xfff)) : (op & 0xfff); switch (cop) { diff --git a/src/devices/cpu/mb86235/mb86235fe.cpp b/src/devices/cpu/mb86235/mb86235fe.cpp index 7bebe4b06dd..00f72be0b9e 100644 --- a/src/devices/cpu/mb86235/mb86235fe.cpp +++ b/src/devices/cpu/mb86235/mb86235fe.cpp @@ -13,14 +13,14 @@ #define AA_USED(desc,x) do { (desc).regin[0] |= 1 << (x); } while(0) #define AA_MODIFIED(desc,x) do { (desc).regout[0] |= 1 << (x); } while(0) -#define AB_USED(desc,x) do { (desc).regin[0] |= 1 << (8+x); } while(0) -#define AB_MODIFIED(desc,x) do { (desc).regout[0] |= 1 << (8+x); } while(0) -#define MA_USED(desc,x) do { (desc).regin[0] |= 1 << (16+x); } while(0) -#define MA_MODIFIED(desc,x) do { (desc).regout[0] |= 1 << (16+x); } while(0) -#define MB_USED(desc,x) do { (desc).regin[0] |= 1 << (24+x); } while(0) -#define MB_MODIFIED(desc,x) do { (desc).regout[0] |= 1 << (24+x); } while(0) -#define AR_USED(desc,x) do { (desc).regin[1] |= 1 << (24+x); } while(0) -#define AR_MODIFIED(desc,x) do { (desc).regout[1] |= 1 << (24+x); } while(0) +#define AB_USED(desc,x) do { (desc).regin[0] |= 1 << (8+(x)); } while(0) +#define AB_MODIFIED(desc,x) do { (desc).regout[0] |= 1 << (8+(x)); } while(0) +#define MA_USED(desc,x) do { (desc).regin[0] |= 1 << (16+(x)); } while(0) +#define MA_MODIFIED(desc,x) do { (desc).regout[0] |= 1 << (16+(x)); } while(0) +#define MB_USED(desc,x) do { (desc).regin[0] |= 1 << (24+(x)); } while(0) +#define MB_MODIFIED(desc,x) do { (desc).regout[0] |= 1 << (24+(x)); } while(0) +#define AR_USED(desc,x) do { (desc).regin[1] |= 1 << (24+(x)); } while(0) +#define AR_MODIFIED(desc,x) do { (desc).regout[1] |= 1 << (24+(x)); } while(0) #define AZ_USED(desc) do { (desc).regin[1] |= 1 << 0; } while (0) #define AZ_MODIFIED(desc) do { (desc).regout[1] |= 1 << 0; } while (0)