From fa452fa6833cbb3088361ac35f4c51716afde520 Mon Sep 17 00:00:00 2001 From: Peter Bergner Date: Fri, 13 Jun 2008 20:16:00 +0000 Subject: include/opcode/ * ppc.h (ppc_cpu_t): New typedef. (struct powerpc_opcode ): Use it. (struct powerpc_operand ): Likewise. (struct powerpc_macro ): Likewise. gas/ * config/tc-ppc.c (ppc_cpu): Use ppc_cpu_t typedef. (ppc_insert_operand): Likewise. (ppc_machine): Likewise. * config/tc-ppc.h: #include "opcode/ppc.h" (struct _ppc_fix_extra ): Use ppc_cpu_t typedef. (ppc_cpu): Update extern decl. opcodes/ * ppc-dis.c (print_insn_powerpc): Update prototye to use new ppc_cpu_t typedef. (struct dis_private): New. (POWERPC_DIALECT): New define. (powerpc_dialect): Renamed to... (powerpc_init_dialect): This. Update to use ppc_cpu_t and struct dis_private. (print_insn_big_powerpc): Update for using structure in info->private_data. (print_insn_little_powerpc): Likewise. (operand_value_powerpc): Change type of dialect param to ppc_cpu_t. (skip_optional_operands): Likewise. (print_insn_powerpc): Likewise. Remove initialization of dialect. * ppc-opc.c (extract_bat, extract_bba, extract_bdm, extract_bdp, extract_bo, extract_boe, extract_fxm, extract_mb6, extract_mbe, extract_nb, extract_nsi, extract_rbs, extract_sh6, extract_spr, extract_sprg, extract_tbr insert_bat, insert_bba, insert_bdm, insert_bdp, insert_bo, insert_boe, insert_fxm, insert_mb6, insert_mbe, insert_nsi, insert_ral, insert_ram, insert_raq, insert_ras, insert_rbs, insert_sh6, insert_spr, insert_sprg, insert_tbr): Change the dialect param to be of type ppc_cpu_t. Update prototype. --- gas/ChangeLog | 9 +++++++++ gas/config/tc-ppc.c | 10 +++++----- gas/config/tc-ppc.h | 6 ++++-- 3 files changed, 18 insertions(+), 7 deletions(-) (limited to 'gas') diff --git a/gas/ChangeLog b/gas/ChangeLog index f26a3ef..cab22f4 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2008-06-13 Peter Bergner + + * config/tc-ppc.c (ppc_cpu): Use ppc_cpu_t typedef. + (ppc_insert_operand): Likewise. + (ppc_machine): Likewise. + * config/tc-ppc.h: #include "opcode/ppc.h" + (struct _ppc_fix_extra ): Use ppc_cpu_t typedef. + (ppc_cpu): Update extern decl. + 2008-06-12 Adam Nemet * config/tc-mips.c (validate_mips_insn): Handle field descriptors diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index ef54165..0aec203 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -181,7 +181,7 @@ int ppc_cie_data_alignment; /* The type of processor we are assembling for. This is one or more of the PPC_OPCODE flags defined in opcode/ppc.h. */ -unsigned long ppc_cpu = 0; +ppc_cpu_t ppc_cpu = 0; /* The target specific pseudo-ops which we support. */ @@ -825,7 +825,7 @@ const size_t md_longopts_size = sizeof (md_longopts); static int parse_cpu (const char *arg) { - unsigned long altivec_or_spe = ppc_cpu & (PPC_OPCODE_ALTIVEC | PPC_OPCODE_SPE); + ppc_cpu_t altivec_or_spe = ppc_cpu & (PPC_OPCODE_ALTIVEC | PPC_OPCODE_SPE); /* -mpwrx and -mpwr2 mean to assemble for the IBM POWER/2 (RIOS2). */ @@ -1573,7 +1573,7 @@ static unsigned long ppc_insert_operand (unsigned long insn, const struct powerpc_operand *operand, offsetT val, - unsigned long ppc_cpu, + ppc_cpu_t ppc_cpu, char *file, unsigned int line) { @@ -4138,7 +4138,7 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED) { char *cpu_string; #define MAX_HISTORY 100 - static unsigned long *cpu_history; + static ppc_cpu_t *cpu_history; static int curr_hist; SKIP_WHITESPACE (); @@ -4159,7 +4159,7 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED) if (cpu_string != NULL) { - unsigned long old_cpu = ppc_cpu; + ppc_cpu_t old_cpu = ppc_cpu; char *p; for (p = cpu_string; *p != 0; p++) diff --git a/gas/config/tc-ppc.h b/gas/config/tc-ppc.h index 5f6f7f2..2702988 100644 --- a/gas/config/tc-ppc.h +++ b/gas/config/tc-ppc.h @@ -22,6 +22,8 @@ #define TC_PPC +#include "opcode/ppc.h" + struct fix; /* Set the endianness we are using. Default to big endian. */ @@ -95,10 +97,10 @@ extern void ppc_handle_align (struct frag *); for later use in md_apply_fix. */ struct _ppc_fix_extra { - unsigned long ppc_cpu; + ppc_cpu_t ppc_cpu; }; -extern unsigned long ppc_cpu; +extern ppc_cpu_t ppc_cpu; #define TC_FIX_TYPE struct _ppc_fix_extra #define TC_INIT_FIX_DATA(FIXP) \ -- cgit v1.1