diff options
| author | Michael Pavone <pavone@retrodev.com> | 2017-03-22 22:16:39 -0700 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2017-03-22 22:16:39 -0700 |
| commit | b13c022c4b885f9ac0e649553211e69187d8aed9 (patch) | |
| tree | 8cf2177c862f7d2fa24efd5e2d9ee0ec0affcf7b | |
| parent | 77882c48c80686680f13b794b83bbbfd4bceeba8 (diff) | |
Fix SBCD edge cases to pass Flamewing's test ROM. Could use some cleanup to produce better code for the SBCD case, but produces correct results now
| -rw-r--r-- | m68k_core_x86.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/m68k_core_x86.c b/m68k_core_x86.c index 55f3a28..ac26072 100644 --- a/m68k_core_x86.c +++ b/m68k_core_x86.c @@ -1472,7 +1472,7 @@ void translate_m68k_abcd_sbcd(m68k_options *opts, m68kinst *inst, host_ea *src_o } else { sbb_rr(code, other_reg + (AH-RAX), opts->gen.scratch1 + (AH-RAX), SZ_B); } - cmp_ir(code, 0xA, opts->gen.scratch1 + (AH-RAX), SZ_B); + cmp_ir(code, inst->op == M68K_SBCD ? 0x10 : 0xA, opts->gen.scratch1 + (AH-RAX), SZ_B); mov_ir(code, 0xA0, other_reg + (AH-RAX), SZ_B); code_ptr no_adjust = code->cur+1; //add correction factor if necessary @@ -1497,9 +1497,14 @@ void translate_m68k_abcd_sbcd(m68k_options *opts, m68kinst *inst, host_ea *src_o //determine if we need a correction on the upper nibble code_ptr def_adjust = code->cur+1; jcc(code, CC_C, def_adjust); - cmp_rr(code, other_reg + (AH-RAX), opts->gen.scratch1, SZ_B); - no_adjust = code->cur+1; - jcc(code, CC_B, no_adjust); + if (inst->op == M68K_SBCD) { + no_adjust = code->cur+1; + jmp(code, no_adjust); + } else { + cmp_rr(code, other_reg + (AH-RAX), opts->gen.scratch1, SZ_B); + no_adjust = code->cur+1; + jcc(code, CC_B, no_adjust); + } *def_adjust = code->cur - (def_adjust + 1); set_flag(opts, 1, FLAG_C); or_ir(code, 0x60, opts->gen.scratch1 + (AH-RAX), SZ_B); |