X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-pj.c;h=37fd4814977f8a66b3f07333baee2ba847a88912;hb=73b090a922a5f43931f0ec10b1b1b9507c819ebf;hp=2a7951eae54ef13ce503a13563decfa68fdcedca;hpb=2132e3a3184eae0655a82965d1cc90c65eddfd98;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-pj.c b/gas/config/tc-pj.c index 2a7951eae5..37fd481497 100644 --- a/gas/config/tc-pj.c +++ b/gas/config/tc-pj.c @@ -1,12 +1,11 @@ -/*- - tc-pj.c -- Assemble code for Pico Java - Copyright 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc. +/* tc-pj.c -- Assemble code for Pico Java + Copyright (C) 1999-2016 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + the Free Software Foundation; either version 3, or (at your option) any later version. GAS is distributed in the hope that it will be useful, @@ -16,8 +15,8 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + the Free Software Foundation, 51 Franklin Street - Fifth Floor, + Boston, MA 02110-1301, USA. */ /* Contributed by Steve Chamberlain of Transmeta . */ @@ -27,43 +26,27 @@ extern const pj_opc_info_t pj_opc_info[512]; -const char comment_chars[] = "!/"; +const char comment_chars[] = "!/"; const char line_separator_chars[] = ";"; -const char line_comment_chars[] = "/!#"; +const char line_comment_chars[] = "/!#"; static int pending_reloc; static struct hash_control *opcode_hash_control; -static void little - PARAMS ((int)); -static void big - PARAMS ((int)); -static char *parse_exp_save_ilp - PARAMS ((char *, expressionS *)); -static int c_to_r - PARAMS ((char)); -static void ipush_code - PARAMS ((pj_opc_info_t *, char *)); -static void fake_opcode - PARAMS ((const char *, void (*) (struct pj_opc_info_t *, char *))); -static void alias - PARAMS ((const char *, const char *)); - static void -little (ignore) - int ignore ATTRIBUTE_UNUSED; +little (int ignore ATTRIBUTE_UNUSED) { target_big_endian = 0; } static void -big (ignore) - int ignore ATTRIBUTE_UNUSED; +big (int ignore ATTRIBUTE_UNUSED) { target_big_endian = 1; } -const pseudo_typeS md_pseudo_table[] = { +const pseudo_typeS md_pseudo_table[] = +{ {"ml", little, 0}, {"mb", big, 0}, {0, 0, 0} @@ -73,8 +56,7 @@ const char FLT_CHARS[] = "rRsSfFdDxXpP"; const char EXP_CHARS[] = "eE"; void -md_operand (op) - expressionS *op; +md_operand (expressionS *op) { if (strncmp (input_line_pointer, "%hi16", 5) == 0) { @@ -84,6 +66,7 @@ md_operand (op) input_line_pointer += 5; expression (op); } + if (strncmp (input_line_pointer, "%lo16", 5) == 0) { if (pending_reloc) @@ -97,11 +80,10 @@ md_operand (op) /* Parse an expression and then restore the input line pointer. */ static char * -parse_exp_save_ilp (s, op) - char *s; - expressionS *op; +parse_exp_save_ilp (char *s, expressionS *op) { char *save = input_line_pointer; + input_line_pointer = s; expression (op); s = input_line_pointer; @@ -114,11 +96,8 @@ parse_exp_save_ilp (s, op) we want to handle magic pending reloc expressions specially. */ void -pj_cons_fix_new_pj (frag, where, nbytes, exp) - fragS *frag; - int where; - int nbytes; - expressionS *exp; +pj_cons_fix_new_pj (fragS *frag, int where, int nbytes, expressionS *exp, + bfd_reloc_code_real_type r ATTRIBUTE_UNUSED) { static int rv[5][2] = { { 0, 0 }, @@ -138,8 +117,7 @@ pj_cons_fix_new_pj (frag, where, nbytes, exp) code which BFD can handle. */ static int -c_to_r (x) - char x; +c_to_r (int x) { switch (x) { @@ -166,9 +144,7 @@ c_to_r (x) turns ipush into sipush lo16, sethi hi16. */ static void -ipush_code (opcode, str) - pj_opc_info_t *opcode ATTRIBUTE_UNUSED; - char *str; +ipush_code (pj_opc_info_t *opcode ATTRIBUTE_UNUSED, char *str) { char *b = frag_more (6); expressionS arg; @@ -192,11 +168,10 @@ ipush_code (opcode, str) not opcodes. The fakeness is indicated with an opcode of -1. */ static void -fake_opcode (name, func) - const char *name; - void (*func) PARAMS ((struct pj_opc_info_t *, char *)); +fake_opcode (const char *name, + void (*func) (struct pj_opc_info_t *, char *)) { - pj_opc_info_t *fake = (pj_opc_info_t *) xmalloc (sizeof (pj_opc_info_t)); + pj_opc_info_t * fake = XNEW (pj_opc_info_t); fake->opcode = -1; fake->opcode_next = -1; @@ -208,11 +183,9 @@ fake_opcode (name, func) can have another name. */ static void -alias (new, old) - const char *new; - const char *old; +alias (const char *new_name, const char *old) { - hash_insert (opcode_hash_control, new, + hash_insert (opcode_hash_control, new_name, (char *) hash_find (opcode_hash_control, old)); } @@ -221,7 +194,7 @@ alias (new, old) some aliases for compatibility with other assemblers. */ void -md_begin () +md_begin (void) { const pj_opc_info_t *opcode; opcode_hash_control = hash_new (); @@ -250,8 +223,7 @@ md_begin () the frags/bytes it assembles to. */ void -md_assemble (str) - char *str; +md_assemble (char *str) { char *op_start; char *op_end; @@ -289,6 +261,7 @@ md_assemble (str) return; } + dwarf2_emit_insn (0); if (opcode->opcode == -1) { /* It's a fake opcode. Dig out the args and pretend that was @@ -313,7 +286,7 @@ md_assemble (str) op_end++; if (*op_end == 0) - as_bad ("expected expresssion"); + as_bad (_("expected expression")); op_end = parse_exp_save_ilp (op_end, &arg); @@ -332,76 +305,24 @@ md_assemble (str) op_end++; if (*op_end != 0) - as_warn ("extra stuff on line ignored"); + as_warn (_("extra stuff on line ignored")); } if (pending_reloc) - as_bad ("Something forgot to clean up\n"); - + as_bad (_("Something forgot to clean up\n")); } -/* Turn a string in input_line_pointer into a floating point constant - of type type, and store the appropriate bytes in *LITP. The number - of LITTLENUMS emitted is stored in *SIZEP . An error message is - returned, or NULL on OK. */ - -char * -md_atof (type, litP, sizeP) - int type; - char *litP; - int *sizeP; +const char * +md_atof (int type, char *litP, int *sizeP) { - int prec; - LITTLENUM_TYPE words[4]; - char *t; - int i; - - switch (type) - { - case 'f': - prec = 2; - break; - - case 'd': - prec = 4; - break; - - default: - *sizeP = 0; - return _("bad call to md_atof"); - } - - t = atof_ieee (input_line_pointer, type, words); - if (t) - input_line_pointer = t; - - *sizeP = prec * 2; - - if (!target_big_endian) - { - for (i = prec - 1; i >= 0; i--) - { - md_number_to_chars (litP, (valueT) words[i], 2); - litP += 2; - } - } - else - { - for (i = 0; i < prec; i++) - { - md_number_to_chars (litP, (valueT) words[i], 2); - litP += 2; - } - } - - return NULL; + return ieee_md_atof (type, litP, sizeP, target_big_endian); } const char *md_shortopts = ""; -struct option md_longopts[] = { - +struct option md_longopts[] = +{ #define OPTION_LITTLE (OPTION_MD_BASE) #define OPTION_BIG (OPTION_LITTLE + 1) @@ -412,9 +333,7 @@ struct option md_longopts[] = { size_t md_longopts_size = sizeof (md_longopts); int -md_parse_option (c, arg) - int c; - char *arg ATTRIBUTE_UNUSED; +md_parse_option (int c, const char *arg ATTRIBUTE_UNUSED) { switch (c) { @@ -431,8 +350,7 @@ md_parse_option (c, arg) } void -md_show_usage (stream) - FILE *stream; +md_show_usage (FILE *stream) { fprintf (stream, _("\ PJ options:\n\ @@ -443,18 +361,13 @@ PJ options:\n\ /* Apply a fixup to the object file. */ void -md_apply_fix3 (fixP, valP, seg) - fixS *fixP; - valueT * valP; - segT seg ATTRIBUTE_UNUSED; +md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED) { char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; long val = *valP; long max, min; - int shift; max = min = 0; - shift = 0; switch (fixP->fx_r_type) { case BFD_RELOC_VTABLE_INHERIT: @@ -542,10 +455,7 @@ md_apply_fix3 (fixP, valP, seg) executable section into big endian order. */ void -md_number_to_chars (ptr, use, nbytes) - char *ptr; - valueT use; - int nbytes; +md_number_to_chars (char *ptr, valueT use, int nbytes) { if (target_big_endian || now_seg->flags & SEC_CODE) number_to_chars_bigendian (ptr, use, nbytes); @@ -557,15 +467,13 @@ md_number_to_chars (ptr, use, nbytes) format. */ arelent * -tc_gen_reloc (section, fixp) - asection *section ATTRIBUTE_UNUSED; - fixS *fixp; +tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp) { arelent *rel; bfd_reloc_code_real_type r_type; - rel = (arelent *) xmalloc (sizeof (arelent)); - rel->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + rel = XNEW (arelent); + rel->sym_ptr_ptr = XNEW (asymbol *); *rel->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); rel->address = fixp->fx_frag->fr_address + fixp->fx_where; @@ -580,7 +488,7 @@ tc_gen_reloc (section, fixp) bfd_get_reloc_code_name (r_type)); /* Set howto to a garbage value so that we can keep going. */ rel->howto = bfd_reloc_type_lookup (stdoutput, BFD_RELOC_32); - assert (rel->howto != NULL); + gas_assert (rel->howto != NULL); } return rel;