X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gas%2Fitbl-ops.c;h=488e3be8d6d98051d1769b36cd6033a099c3b34e;hb=e5e27b0769acf1c864ac9e41544c0747d1058cd5;hp=9d6e8ffbbf53b3b8033f52e03434cbe97b8d7db5;hpb=9c2799c243988c1a6d3fe93c7c2c06599672068d;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/itbl-ops.c b/gas/itbl-ops.c index 9d6e8ffbbf..488e3be8d6 100644 --- a/gas/itbl-ops.c +++ b/gas/itbl-ops.c @@ -1,6 +1,5 @@ /* itbl-ops.c - Copyright 1997, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, - 2009 Free Software Foundation, Inc. + Copyright (C) 1997-2016 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -300,7 +299,10 @@ append_insns_as_macros (void) { struct ITBL_OPCODE_STRUCT *new_opcodes, *o; struct itbl_entry *e, **es; - int n, id, size, new_size, new_num_opcodes; + int n, size, new_num_opcodes; +#ifdef USE_MACROS + int id; +#endif if (!itbl_have_entries) return; @@ -318,12 +320,9 @@ append_insns_as_macros (void) ASSERT (size >= 0); DBG (("I get=%d\n", size / sizeof (ITBL_OPCODES[0]))); - new_size = sizeof (struct ITBL_OPCODE_STRUCT) * new_num_opcodes; - ASSERT (new_size > size); - /* FIXME since ITBL_OPCODES culd be a static table, we can't realloc or delete the old memory. */ - new_opcodes = (struct ITBL_OPCODE_STRUCT *) malloc (new_size); + new_opcodes = XNEWVEC (struct ITBL_OPCODE_STRUCT, new_num_opcodes); if (!new_opcodes) { printf (_("Unable to allocate memory for new instructions\n")); @@ -335,7 +334,9 @@ append_insns_as_macros (void) /* FIXME! some NUMOPCODES are calculated expressions. These need to be changed before itbls can be supported. */ +#ifdef USE_MACROS id = ITBL_NUM_MACROS; /* begin the next macro id after the last */ +#endif o = &new_opcodes[ITBL_NUM_OPCODES]; /* append macro to opcodes list */ for (n = e_p0; n < e_nprocs; n++) { @@ -849,13 +850,11 @@ alloc_entry (e_processor processor, e_type type, struct itbl_entry *e, **es; if (!name) return 0; - e = (struct itbl_entry *) malloc (sizeof (struct itbl_entry)); + e = XNEW (struct itbl_entry); if (e) { memset (e, 0, sizeof (struct itbl_entry)); - e->name = (char *) malloc (sizeof (strlen (name)) + 1); - if (e->name) - strcpy (e->name, name); + e->name = xstrdup (name); e->processor = processor; e->type = type; e->value = value; @@ -873,7 +872,7 @@ alloc_field (e_type type, int sbit, int ebit, unsigned long flags) { struct itbl_field *f; - f = (struct itbl_field *) malloc (sizeof (struct itbl_field)); + f = XNEW (struct itbl_field); if (f) { memset (f, 0, sizeof (struct itbl_field));