aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-ppc.c2
-rw-r--r--opcodes/ChangeLog5
-rw-r--r--opcodes/ppc-dis.c12
4 files changed, 17 insertions, 7 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1a66686..86b3c35 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-03 Andreas Schwab <schwab@linux-m68k.org>
+
+ * config/tc-ppc.c (ppc_set_cpu): Cast PPC_OPCODE_xxx to ppc_cpu_t
+ before inverting.
+
2010-07-03 Alan Modra <amodra@gmail.com>
* config/tc-ppc.c (ppc_set_cpu): Remove old opcode flags.
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index df298db..1321cd4 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -1248,7 +1248,7 @@ ppc_set_cpu (void)
const char *default_os = TARGET_OS;
const char *default_cpu = TARGET_CPU;
- if ((ppc_cpu & ~PPC_OPCODE_ANY) == 0)
+ if ((ppc_cpu & ~(ppc_cpu_t) PPC_OPCODE_ANY) == 0)
{
if (ppc_obj64)
ppc_cpu |= PPC_OPCODE_PPC | PPC_OPCODE_64;
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 1962aeb..8b5b6a4 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-03 Andreas Schwab <schwab@linux-m68k.org>
+
+ * ppc-dis.c (powerpc_init_dialect): Cast PPC_OPCODE_xxx to
+ ppc_cpu_t before inverting.
+
2010-07-03 Alan Modra <amodra@gmail.com>
* ppc-dis.c (ppc_opts, powerpc_init_dialect): Remove old opcode flags.
diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index 9170e98..8771f95 100644
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -189,8 +189,8 @@ ppc_parse_cpu (ppc_cpu_t ppc_cpu, const char *arg)
if (ppc_opts[i].sticky)
{
retain_flags |= ppc_opts[i].sticky;
- if ((ppc_cpu & ~(PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX
- | PPC_OPCODE_SPE | PPC_OPCODE_ANY)) != 0)
+ if ((ppc_cpu & ~(ppc_cpu_t) (PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX
+ | PPC_OPCODE_SPE | PPC_OPCODE_ANY)) != 0)
break;
}
ppc_cpu = ppc_opts[i].cpu;
@@ -227,7 +227,7 @@ powerpc_init_dialect (struct disassemble_info *info)
if ((new_cpu = ppc_parse_cpu (dialect, arg)) != 0)
dialect = new_cpu;
else if (strcmp (arg, "32") == 0)
- dialect &= ~PPC_OPCODE_64;
+ dialect &= ~(ppc_cpu_t) PPC_OPCODE_64;
else if (strcmp (arg, "64") == 0)
dialect |= PPC_OPCODE_64;
else
@@ -238,12 +238,12 @@ powerpc_init_dialect (struct disassemble_info *info)
arg = end;
}
- if ((dialect & ~PPC_OPCODE_64) == 0)
+ if ((dialect & ~(ppc_cpu_t) PPC_OPCODE_64) == 0)
{
if (info->mach == bfd_mach_ppc64)
dialect |= PPC_OPCODE_64;
else
- dialect &= ~PPC_OPCODE_64;
+ dialect &= ~(ppc_cpu_t) PPC_OPCODE_64;
/* Choose a reasonable default. */
dialect |= (PPC_OPCODE_PPC | PPC_OPCODE_COMMON | PPC_OPCODE_601
| PPC_OPCODE_ALTIVEC);
@@ -505,7 +505,7 @@ print_insn_powerpc (bfd_vma memaddr,
if ((dialect & PPC_OPCODE_ANY) != 0)
{
- dialect = ~PPC_OPCODE_ANY;
+ dialect = ~(ppc_cpu_t) PPC_OPCODE_ANY;
goto again;
}