From a30e9cc4a092ed45c7c4c68fc0bfa343782adbae Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 19 May 2004 05:11:48 +0000 Subject: [PATCH] * ppc-opc.c (insert_fxm): Enable two operand mfcr when -many as well as when -mpower4. --- opcodes/ChangeLog | 7 ++++++- opcodes/ppc-opc.c | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 8ef9095..3cd88ab 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2004-05-19 Alan Modra + + * ppc-opc.c (insert_fxm): Enable two operand mfcr when -many as + well as when -mpower4. + 2004-05-13 Nick Clifton * po/fr.po: Updated French translation. @@ -10,7 +15,7 @@ 2004-05-05 Alan Modra - PR 146. + PR 147. * ppc-opc.c (PPCVEC): Remove PPC_OPCODE_PPC. 2004-04-29 Ben Elliston diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c index 35f7fc6..51fcfe2 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -1004,8 +1004,13 @@ insert_fxm (unsigned long insn, /* If only one bit of the FXM field is set, we can use the new form of the instruction, which is faster. Unlike the Power4 branch hint - encoding, this is not backward compatible. */ - else if ((dialect & PPC_OPCODE_POWER4) != 0 && (value & -value) == value) + encoding, this is not backward compatible. Do not generate the + new form unless -mpower4 has been given, or -many and the two + operand form of mfcr was used. */ + else if ((value & -value) == value + && ((dialect & PPC_OPCODE_POWER4) != 0 + || ((dialect & PPC_OPCODE_ANY) != 0 + && (insn & (0x3ff << 1)) == 19 << 1))) insn |= 1 << 20; /* Any other value on mfcr is an error. */ -- 2.7.4