From d0fa13723fd15e60923d79b463247b15179608fa Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Thu, 27 Sep 2007 11:14:10 +0000 Subject: [PATCH] gas/ * config/m68k-parse.h (m68k_register): Use MBO instead of MBB. (last_movec_reg): Change to MBO. * config/tc-m68k.c (fido_ctrl): Use MBO instead of MBB. (m68k_ip): Use MBO instead of MBO. (init_table): Use MBO instead of MBO. Add an entry for mbo. gas/testsuite/ * gas/m68k/fido.s: Add tests for %mbo. * gas/m68k/fido.d: Update accordingly. opcodes/ * m68k-dis.c (print_insn_arg): Use %mbo instead of %mbb. --- gas/ChangeLog | 8 ++++++++ gas/config/m68k-parse.h | 4 ++-- gas/config/tc-m68k.c | 7 ++++--- gas/testsuite/ChangeLog | 5 +++++ gas/testsuite/gas/m68k/fido.d | 20 ++++++++++++-------- gas/testsuite/gas/m68k/fido.s | 4 ++++ opcodes/ChangeLog | 4 ++++ opcodes/m68k-dis.c | 2 +- 8 files changed, 40 insertions(+), 14 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 4c02e1dba40..db081b6d7f9 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2007-09-27 Kazu Hirata + + * config/m68k-parse.h (m68k_register): Use MBO instead of MBB. + (last_movec_reg): Change to MBO. + * config/tc-m68k.c (fido_ctrl): Use MBO instead of MBB. + (m68k_ip): Use MBO instead of MBO. + (init_table): Use MBO instead of MBO. Add an entry for mbo. + 2007-09-26 Jan Beulich * config/tc-i386.c (build_modrm_byte): Also check for RegEip diff --git a/gas/config/m68k-parse.h b/gas/config/m68k-parse.h index 6695cfc3daf..f39bb825df1 100644 --- a/gas/config/m68k-parse.h +++ b/gas/config/m68k-parse.h @@ -131,8 +131,8 @@ enum m68k_register MBAR, ASID, /* m5475. */ CAC, /* fido added this. */ - MBB, -#define last_movec_reg MBB + MBO, +#define last_movec_reg MBO /* End of movec ordering constraints. */ FPI, diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c index 569a89e9690..78f6a9aa63b 100644 --- a/gas/config/tc-m68k.c +++ b/gas/config/tc-m68k.c @@ -309,7 +309,7 @@ static const enum m68k_register mcf5485_ctrl[] = { 0 }; static const enum m68k_register fido_ctrl[] = { - SFC, DFC, USP, VBR, CAC, MBB, + SFC, DFC, USP, VBR, CAC, MBO, 0 }; #define cpu32_ctrl m68010_ctrl @@ -3265,7 +3265,7 @@ m68k_ip (char *instring) case CAC: tmpreg = 0xFFE; break; - case MBB: + case MBO: tmpreg = 0xFFF; break; default: @@ -4006,7 +4006,8 @@ static const struct init_entry init_table[] = { "mbar2", MBAR2 }, /* mcf5249 registers. */ { "cac", CAC }, /* fido registers. */ - { "mbb", MBB }, /* fido registers. */ + { "mbb", MBO }, /* fido registers (obsolete). */ + { "mbo", MBO }, /* fido registers. */ /* End of control registers. */ { "ac", AC }, diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index a84293ea75b..32d52630a82 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-09-27 Kazu Hirata + + * gas/m68k/fido.s: Add tests for %mbo. + * gas/m68k/fido.d: Update accordingly. + 2007-09-26 Jan Beulich * gas/i386/x86-64-addr32.d: Adjust expectations. diff --git a/gas/testsuite/gas/m68k/fido.d b/gas/testsuite/gas/m68k/fido.d index fff5abbef38..b7227339f85 100644 --- a/gas/testsuite/gas/m68k/fido.d +++ b/gas/testsuite/gas/m68k/fido.d @@ -25,17 +25,21 @@ Disassembly of section .text: 0+020 trapx #15 0+022 movec %cac,%d0 0+026 movec %cac,%a0 -0+02a movec %mbb,%d1 -0+02e movec %mbb,%a1 +0+02a movec %mbo,%d1 +0+02e movec %mbo,%a1 0+032 movec %d2,%cac 0+036 movec %a2,%cac -0+03a movec %d3,%mbb -0+03e movec %a3,%mbb +0+03a movec %d3,%mbo +0+03e movec %a3,%mbo 0+042 movec %cac,%d4 0+046 movec %cac,%a4 -0+04a movec %mbb,%d5 -0+04e movec %mbb,%a5 +0+04a movec %mbo,%d5 +0+04e movec %mbo,%a5 0+052 movec %d6,%cac 0+056 movec %fp,%cac -0+05a movec %d7,%mbb -0+05e movec %sp,%mbb +0+05a movec %d7,%mbo +0+05e movec %sp,%mbo +0+062 movec %mbo,%d0 +0+066 movec %mbo,%a0 +0+06a movec %d1,%mbo +0+06e movec %a1,%mbo diff --git a/gas/testsuite/gas/m68k/fido.s b/gas/testsuite/gas/m68k/fido.s index 8aaac7c5473..41222180654 100644 --- a/gas/testsuite/gas/m68k/fido.s +++ b/gas/testsuite/gas/m68k/fido.s @@ -35,3 +35,7 @@ foo: movec %a6,%cac movec %d7,%mbb movec %a7,%mbb + movec %mbo,%d0 + movec %mbo,%a0 + movec %d1,%mbo + movec %a1,%mbo diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 82d3eef26c2..391b552c7e1 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2007-09-27 Kazu Hirata + + * m68k-dis.c (print_insn_arg): Use %mbo instead of %mbb. + 2007-09-26 James E. Wilson * ia64-gen.c (print_dependency_table): Fix typo in last patch. diff --git a/opcodes/m68k-dis.c b/opcodes/m68k-dis.c index b9d8a0471cb..77820ef8a0f 100644 --- a/opcodes/m68k-dis.c +++ b/opcodes/m68k-dis.c @@ -641,7 +641,7 @@ print_insn_arg (const char *d, {"%urp", 0x806}, {"%srp", 0x807}, {"%pcr", 0x808}, /* Fido added these. */ - {"%cac", 0xffe}, {"%mbb", 0xfff}}; + {"%cac", 0xffe}, {"%mbo", 0xfff}}; val = fetch_arg (buffer, place, 12, info); for (regno = sizeof names / sizeof names[0] - 1; regno >= 0; regno--) -- 2.30.2