diff options
| author | Nick Clifton <nickc@redhat.com> | 2002-09-04 12:37:30 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2002-09-04 12:37:30 +0000 |
| commit | 6e5f059e63d32ee75134d11cd1f04122e085699c (patch) | |
| tree | b18f7a99772df1fcc134a9f420da51d2be0e2c12 | |
| parent | 2f03c436f5a376a28bdbd193173a57e78503392c (diff) | |
| download | binutils-redhat-6e5f059e63d32ee75134d11cd1f04122e085699c.tar.gz | |
Do not insert non-BookE32 instructions into the hash table if the target cpu
is the BookE32. (case 107575)
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-ppc.c | 8 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 4 | ||||
| -rw-r--r-- | opcodes/ppc-opc.c | 4 |
4 files changed, 19 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index f9466e97d7..2d8c4af9d3 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2002-09-04 Nick Clifton <nickc@redhat.com> + + * config/tc-ppc.c (md_begin): Do not insert non-BookE32 + instructions into the hash table if the target cpu is the BookE32. + 2002-08-31 Hans-Peter Nilsson <hp@bitrange.com> * read.c (do_align): Use ATTRIBUTE_UNUSED_LABEL for label, not diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index b19e04d46b..b7679f9736 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -1207,6 +1207,14 @@ md_begin () || ((op->flags & (PPC_OPCODE_32 | PPC_OPCODE_64)) == (ppc_cpu & (PPC_OPCODE_32 | PPC_OPCODE_64))) || (ppc_cpu & PPC_OPCODE_64_BRIDGE) != 0) + /* Certain instructions (eg: extsw) do not exist in the + 32-bit BookE instruction set, but they do exist in the + 64-bit BookE instruction set, and other PPC instruction + sets. Check to see if the opcode has the BOOKE64 flag set. + If it does make sure that the target CPU is not the BookE32. */ + && ((op->flags & PPC_OPCODE_BOOKE64) == 0 + || (ppc_cpu & PPC_OPCODE_BOOKE64) == PPC_OPCODE_BOOKE64 + || (ppc_cpu & PPC_OPCODE_BOOKE) == 0) && ((op->flags & (PPC_OPCODE_POWER4 | PPC_OPCODE_NOPOWER4)) == 0 || ((op->flags & PPC_OPCODE_POWER4) == (ppc_cpu & PPC_OPCODE_POWER4)))) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 9f0d0d193b..f1c202822d 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,9 @@ 2002-09-04 Nick Clifton <nickc@redhat.com> + * ppc-opc.c (extsw, extsw.): Do not allow for the BookE32. + +2002-09-04 Nick Clifton <nickc@redhat.com> + * disassemble.c (disassembler_usage): Add invocation of print_ppc_disassembler_options. * ppc-dis.c (print_ppc_disassembler_options): New function. diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c index ff7e8d7628..1a8627f7eb 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -4238,8 +4238,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { { "stfiwx", X(31,983), X_MASK, PPC, { FRS, RA, RB } }, -{ "extsw", XRC(31,986,0), XRB_MASK, PPC, { RA, RS } }, -{ "extsw.", XRC(31,986,1), XRB_MASK, PPC, { RA, RS } }, +{ "extsw", XRC(31,986,0), XRB_MASK, PPC | BOOKE64, { RA, RS } }, +{ "extsw.", XRC(31,986,1), XRB_MASK, PPC | BOOKE64, { RA, RS } }, { "icread", X(31,998), XRT_MASK, PPC403, { RA, RB } }, |