diff options
author | 2008-06-05 17:21:35 +0000 | |
---|---|---|
committer | 2008-06-05 17:21:35 +0000 | |
commit | cf4b81fba9a8cf43b623e69733986accd388f5a9 (patch) | |
tree | 95dece24e682a03e9ba00d0a8550fe8299c80d1c /src/emu/cpu/drcbec.c | |
parent | 1bc774b32b7bc31fa4e0536e2d882c2589819e59 (diff) |
Separated condflags into two individual fields.
Diffstat (limited to 'src/emu/cpu/drcbec.c')
-rw-r--r-- | src/emu/cpu/drcbec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/cpu/drcbec.c b/src/emu/cpu/drcbec.c index 925b42d2d98..c05cf280121 100644 --- a/src/emu/cpu/drcbec.c +++ b/src/emu/cpu/drcbec.c @@ -114,12 +114,12 @@ enum */ /* build a short opcode from the raw opcode and size */ -#define MAKE_OPCODE_SHORT(op, size, condflags) \ - ((((size) == 8) << 0) | (((condflags) != 0) << 1) | ((op) << 2)) +#define MAKE_OPCODE_SHORT(op, size, conditionorflags) \ + ((((size) == 8) << 0) | (((conditionorflags) != 0) << 1) | ((op) << 2)) /* build a full opcode from the raw opcode, size, condition/flags, and immediate count */ -#define MAKE_OPCODE_FULL(op, size, condflags, pwords) \ - (MAKE_OPCODE_SHORT(op, size, condflags) | ((condflags & 0x80) ? (0x1000 << ((condflags) & 15)) : 0) | ((pwords) << 28)) +#define MAKE_OPCODE_FULL(op, size, condition, flags, pwords) \ + (MAKE_OPCODE_SHORT(op, size, (condition | flags)) | ((condition != DRCUML_COND_ALWAYS) ? (0x1000 << ((condition) & 15)) : 0) | ((pwords) << 28)) /* extract various parts of the opcode */ #define OPCODE_GET_SHORT(op) ((op) & 0xfff) @@ -431,7 +431,7 @@ static void drcbec_generate(drcbe_state *drcbe, drcuml_block *block, const drcum case DRCUML_OP_JMP: assert(inst->numparams == 1); assert(inst->param[0].type == DRCUML_PTYPE_IMMEDIATE); - (dst++)->i = MAKE_OPCODE_FULL(opcode, inst->size, inst->condflags, 1); + (dst++)->i = MAKE_OPCODE_FULL(opcode, inst->size, inst->condition, inst->flags, 1); dst->inst = (drcbec_instruction *)drclabel_get_codeptr(drcbe->labels, inst->param[0].value, fixup_label, dst); dst++; break; @@ -501,7 +501,7 @@ static void drcbec_generate(drcbe_state *drcbe, drcuml_block *block, const drcum immedwords = (immedbytes + sizeof(drcbec_instruction) - 1) / sizeof(drcbec_instruction); /* first item is the opcode, size, condition flags and length */ - (dst++)->i = MAKE_OPCODE_FULL(opcode, inst->size, inst->condflags, inst->numparams + immedwords); + (dst++)->i = MAKE_OPCODE_FULL(opcode, inst->size, inst->condition, inst->flags, inst->numparams + immedwords); /* immediates start after parameters */ immed = dst + inst->numparams; |