aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog8
-rw-r--r--gas/config/m68k-parse.h4
-rw-r--r--gas/config/tc-m68k.c7
-rw-r--r--gas/testsuite/ChangeLog5
-rw-r--r--gas/testsuite/gas/m68k/fido.d20
-rw-r--r--gas/testsuite/gas/m68k/fido.s4
6 files changed, 35 insertions, 13 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4c02e1d..db081b6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-27 Kazu Hirata <kazu@codesourcery.com>
+
+ * 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 <jbeulich@novell.com>
* 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 6695cfc..f39bb82 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 569a89e..78f6a9aa 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 a84293e..32d5263 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-27 Kazu Hirata <kazu@codesourcery.com>
+
+ * gas/m68k/fido.s: Add tests for %mbo.
+ * gas/m68k/fido.d: Update accordingly.
+
2007-09-26 Jan Beulich <jbeulich@novell.com>
* 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 fff5abb..b722733 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 <foo\+(0x|)20> trapx #15
0+022 <foo\+(0x|)22> movec %cac,%d0
0+026 <foo\+(0x|)26> movec %cac,%a0
-0+02a <foo\+(0x|)2a> movec %mbb,%d1
-0+02e <foo\+(0x|)2e> movec %mbb,%a1
+0+02a <foo\+(0x|)2a> movec %mbo,%d1
+0+02e <foo\+(0x|)2e> movec %mbo,%a1
0+032 <foo\+(0x|)32> movec %d2,%cac
0+036 <foo\+(0x|)36> movec %a2,%cac
-0+03a <foo\+(0x|)3a> movec %d3,%mbb
-0+03e <foo\+(0x|)3e> movec %a3,%mbb
+0+03a <foo\+(0x|)3a> movec %d3,%mbo
+0+03e <foo\+(0x|)3e> movec %a3,%mbo
0+042 <foo\+(0x|)42> movec %cac,%d4
0+046 <foo\+(0x|)46> movec %cac,%a4
-0+04a <foo\+(0x|)4a> movec %mbb,%d5
-0+04e <foo\+(0x|)4e> movec %mbb,%a5
+0+04a <foo\+(0x|)4a> movec %mbo,%d5
+0+04e <foo\+(0x|)4e> movec %mbo,%a5
0+052 <foo\+(0x|)52> movec %d6,%cac
0+056 <foo\+(0x|)56> movec %fp,%cac
-0+05a <foo\+(0x|)5a> movec %d7,%mbb
-0+05e <foo\+(0x|)5e> movec %sp,%mbb
+0+05a <foo\+(0x|)5a> movec %d7,%mbo
+0+05e <foo\+(0x|)5e> movec %sp,%mbo
+0+062 <foo\+(0x|)62> movec %mbo,%d0
+0+066 <foo\+(0x|)66> movec %mbo,%a0
+0+06a <foo\+(0x|)6a> movec %d1,%mbo
+0+06e <foo\+(0x|)6e> movec %a1,%mbo
diff --git a/gas/testsuite/gas/m68k/fido.s b/gas/testsuite/gas/m68k/fido.s
index 8aaac7c..4122218 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