X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fcgen.c;h=a535214e9ecd2deaf7e1eb7a6aa7f4c84deab6b9;hb=c84364ece4faa7b3eb0f60f4dc301282e9693e1e;hp=61ac60dc264ee98b46e9dc58325f29e680b307ad;hpb=4b95cf5c0c75d6efc1b2f96af72317aecca079f1;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/cgen.c b/gas/cgen.c index 61ac60dc26..a535214e9e 100644 --- a/gas/cgen.c +++ b/gas/cgen.c @@ -1,5 +1,5 @@ /* GAS interface for targets using CGEN: Cpu tools GENerator. - Copyright (C) 1996-2014 Free Software Foundation, Inc. + Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -37,7 +37,7 @@ static unsigned long gas_cgen_encode_addend const unsigned long, const unsigned long, const unsigned long, \ const unsigned long); -static char * weak_operand_overflow_check +static const char * weak_operand_overflow_check (const expressionS *, const CGEN_OPERAND *); static void queue_fixup_recursively @@ -57,9 +57,7 @@ CGEN_CPU_DESC gas_cgen_cpu_desc; ??? Not currently used. */ void -cgen_asm_record_register (name, number) - char *name; - int number; +cgen_asm_record_register (char *name, int number) { /* Use symbol_create here instead of symbol_new so we don't try to output registers into the object file's symbol table. */ @@ -94,7 +92,7 @@ static int num_fixups; ??? May wish to make this static and delete calls in md_assemble. */ void -gas_cgen_init_parse () +gas_cgen_init_parse (void) { num_fixups = 0; } @@ -102,10 +100,7 @@ gas_cgen_init_parse () /* Queue a fixup. */ static void -queue_fixup (opindex, opinfo, expP) - int opindex; - int opinfo; - expressionS * expP; +queue_fixup (int opindex, int opinfo, expressionS *expP) { /* We need to generate a fixup for this expression. */ if (num_fixups >= GAS_CGEN_MAX_FIXUPS) @@ -159,7 +154,7 @@ struct saved_fixups static struct saved_fixups stored_fixups[MAX_SAVED_FIXUP_CHAINS]; void -gas_cgen_initialize_saved_fixups_array () +gas_cgen_initialize_saved_fixups_array (void) { int i = 0; @@ -168,8 +163,7 @@ gas_cgen_initialize_saved_fixups_array () } void -gas_cgen_save_fixups (i) - int i; +gas_cgen_save_fixups (int i) { if (i < 0 || i >= MAX_SAVED_FIXUP_CHAINS) { @@ -184,8 +178,7 @@ gas_cgen_save_fixups (i) } void -gas_cgen_restore_fixups (i) - int i; +gas_cgen_restore_fixups (int i) { if (i < 0 || i >= MAX_SAVED_FIXUP_CHAINS) { @@ -200,8 +193,7 @@ gas_cgen_restore_fixups (i) } void -gas_cgen_swap_fixups (i) - int i; +gas_cgen_swap_fixups (int i) { if (i < 0 || i >= MAX_SAVED_FIXUP_CHAINS) { @@ -247,15 +239,9 @@ gas_cgen_swap_fixups (i) operand type. We pick a BFD reloc type in md_apply_fix. */ fixS * -gas_cgen_record_fixup (frag, where, insn, length, operand, opinfo, symbol, offset) - fragS * frag; - int where; - const CGEN_INSN * insn; - int length; - const CGEN_OPERAND * operand; - int opinfo; - symbolS * symbol; - offsetT offset; +gas_cgen_record_fixup (fragS *frag, int where, const CGEN_INSN *insn, + int length, const CGEN_OPERAND *operand, int opinfo, + symbolS *symbol, offsetT offset) { fixS *fixP; @@ -288,14 +274,9 @@ gas_cgen_record_fixup (frag, where, insn, length, operand, opinfo, symbol, offse operand type. We pick a BFD reloc type in md_apply_fix. */ fixS * -gas_cgen_record_fixup_exp (frag, where, insn, length, operand, opinfo, exp) - fragS * frag; - int where; - const CGEN_INSN * insn; - int length; - const CGEN_OPERAND * operand; - int opinfo; - expressionS * exp; +gas_cgen_record_fixup_exp (fragS *frag, int where, const CGEN_INSN *insn, + int length, const CGEN_OPERAND *operand, int opinfo, + expressionS *exp) { fixS *fixP; @@ -344,19 +325,11 @@ static int expr_jmp_buf_p; The resulting value is stored in VALUEP. */ const char * -gas_cgen_parse_operand (cd, want, strP, opindex, opinfo, resultP, valueP) - -#ifdef OBJ_COMPLEX_RELC - CGEN_CPU_DESC cd; -#else - CGEN_CPU_DESC cd ATTRIBUTE_UNUSED; -#endif - enum cgen_parse_operand_type want; - const char **strP; - int opindex; - int opinfo; - enum cgen_parse_operand_result *resultP; - bfd_vma *valueP; +gas_cgen_parse_operand (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED, + enum cgen_parse_operand_type want, const char **strP, + int opindex, int opinfo, + enum cgen_parse_operand_result *resultP, + bfd_vma *valueP) { #ifdef __STDC__ /* These are volatile to survive the setjmp. */ @@ -525,8 +498,7 @@ gas_cgen_parse_operand (cd, want, strP, opindex, opinfo, resultP, valueP) ??? This could be done differently by adding code to `expression'. */ void -gas_cgen_md_operand (expressionP) - expressionS *expressionP ATTRIBUTE_UNUSED; +gas_cgen_md_operand (expressionS *expressionP ATTRIBUTE_UNUSED) { /* Don't longjmp if we're not called from within cgen_parse_operand(). */ if (expr_jmp_buf_p) @@ -541,12 +513,8 @@ gas_cgen_md_operand (expressionP) The "result" is stored in RESULT if non-NULL. */ void -gas_cgen_finish_insn (insn, buf, length, relax_p, result) - const CGEN_INSN *insn; - CGEN_INSN_BYTES_PTR buf; - unsigned int length; - int relax_p; - finished_insnS *result; +gas_cgen_finish_insn (const CGEN_INSN *insn, CGEN_INSN_BYTES_PTR buf, + unsigned int length, int relax_p, finished_insnS *result) { int i; int relax_operand; @@ -780,7 +748,7 @@ gas_cgen_encode_addend (const unsigned long start, /* in bits */ overflow, so signal it by returning an error string. Any other case is ambiguous, so we assume it's OK and return NULL. */ -static char * +static const char * weak_operand_overflow_check (const expressionS * exp, const CGEN_OPERAND * operand) { @@ -843,7 +811,7 @@ make_right_shifted_expr (expressionS * exp, stmp->bsym->flags |= BSF_RELC; /* Then wrap that in a "symbol expr" for good measure. */ - new_exp = xmalloc (sizeof (expressionS)); + new_exp = XNEW (expressionS); memset (new_exp, 0, sizeof (expressionS)); new_exp->X_op = O_symbol; new_exp->X_op_symbol = 0; @@ -868,10 +836,7 @@ make_right_shifted_expr (expressionS * exp, should handle them all. */ void -gas_cgen_md_apply_fix (fixP, valP, seg) - fixS * fixP; - valueT * valP; - segT seg ATTRIBUTE_UNUSED; +gas_cgen_md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) { char *where = fixP->fx_frag->fr_literal + fixP->fx_where; valueT value = * valP; @@ -891,7 +856,6 @@ gas_cgen_md_apply_fix (fixP, valP, seg) const CGEN_OPERAND *operand = cgen_operand_lookup_by_num (cd, opindex); const char *errmsg; bfd_reloc_code_real_type reloc_type; - CGEN_FIELDS *fields = alloca (CGEN_CPU_SIZEOF_FIELDS (cd)); const CGEN_INSN *insn = fixP->fx_cgen.insn; #ifdef OBJ_COMPLEX_RELC int start; @@ -927,6 +891,8 @@ gas_cgen_md_apply_fix (fixP, valP, seg) finish the job. Testing for pcrel is a temporary hack. */ || fixP->fx_pcrel) { + CGEN_FIELDS *fields = xmalloc (CGEN_CPU_SIZEOF_FIELDS (cd)); + CGEN_CPU_SET_FIELDS_BITSIZE (cd) (fields, CGEN_INSN_BITSIZE (insn)); CGEN_CPU_SET_VMA_OPERAND (cd) (cd, opindex, fields, (bfd_vma) value); @@ -950,6 +916,8 @@ gas_cgen_md_apply_fix (fixP, valP, seg) #endif if (errmsg) as_bad_where (fixP->fx_file, fixP->fx_line, "%s", errmsg); + + free (fields); } if (fixP->fx_done) @@ -1039,14 +1007,12 @@ gas_cgen_pcrel_r_type (bfd_reloc_code_real_type r) FIXME: To what extent can we get all relevant targets to use this? */ arelent * -gas_cgen_tc_gen_reloc (section, fixP) - asection * section ATTRIBUTE_UNUSED; - fixS * fixP; +gas_cgen_tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixP) { bfd_reloc_code_real_type r_type = fixP->fx_r_type; arelent *reloc; - reloc = (arelent *) xmalloc (sizeof (arelent)); + reloc = XNEW (arelent); #ifdef GAS_CGEN_PCREL_R_TYPE if (fixP->fx_pcrel) @@ -1063,7 +1029,7 @@ gas_cgen_tc_gen_reloc (section, fixP) gas_assert (!fixP->fx_pcrel == !reloc->howto->pc_relative); - reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + reloc->sym_ptr_ptr = XNEW (asymbol *); *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixP->fx_addsy); /* Use fx_offset for these cases. */ @@ -1081,7 +1047,7 @@ gas_cgen_tc_gen_reloc (section, fixP) Called after gas_cgen_cpu_desc has been created. */ void -gas_cgen_begin () +gas_cgen_begin (void) { if (flag_signed_overflow_ok) cgen_set_signed_overflow_ok (gas_cgen_cpu_desc);