aboutsummaryrefslogtreecommitdiff
path: root/gas/config/tc-d10v.c
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2007-02-28 18:38:51 +0000
committerNick Clifton <nickc@redhat.com>2007-02-28 18:38:51 +0000
commitc5d07591f70f3527889131bb7f6750755d97a043 (patch)
tree1460dbf81e60878df43b37ccb8d39ce9a6d10e34 /gas/config/tc-d10v.c
parent35f196d907ec76a78167173efb1cdeedfcac93bf (diff)
downloadgdb-c5d07591f70f3527889131bb7f6750755d97a043.zip
gdb-c5d07591f70f3527889131bb7f6750755d97a043.tar.gz
gdb-c5d07591f70f3527889131bb7f6750755d97a043.tar.bz2
PR gas/3797
* config/tc-d10v.c (do_assemble): Do not generate error messages, just return -1 whenever a problem is encoun$ (md_assemble): If do_assemble returns -1 generate a non-fatal error message and return. * gas/lns/lns.exp: Do not run the lns-common test for the d10v port. * gas/d10v/address-002.l: Update expected assembler output. * gas/d10v/address-003.l, gas/d10v/address-004.l, gas/d10v/address-005.l, gas/d10v/address-006.l, gas/d10v/address-007.l, gas/d10v/address-008.l, gas/d10v/address-009.l, gas/d10v/address-010.l, gas/d10v/address-011.l, gas/d10v/address-012.l, gas/d10v/address-013.l, gas/d10v/address-014.l, gas/d10v/address-015.l, gas/d10v/address-016.l, gas/d10v/address-017.l, gas/d10v/address-018.l, gas/d10v/address-019.l, gas/d10v/address-020.l, gas/d10v/address-021.l, gas/d10v/address-022.l, gas/d10v/address-023.l, gas/d10v/address-024.l, gas/d10v/address-025.l, gas/d10v/address-026.l, gas/d10v/address-027.l, gas/d10v/address-030.l, gas/d10v/address-031.l, gas/d10v/address-032.l, gas/d10v/address-033.l, gas/d10v/address-034.l, gas/d10v/address-035.l, gas/d10v/address-036.l, gas/d10v/address-037.l, gas/d10v/address-038.l, gas/d10v/address-039.l, gas/d10v/address-040.l, gas/d10v/address-041.l: Likewise.
Diffstat (limited to 'gas/config/tc-d10v.c')
-rw-r--r--gas/config/tc-d10v.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/gas/config/tc-d10v.c b/gas/config/tc-d10v.c
index c12eb64..245162a 100644
--- a/gas/config/tc-d10v.c
+++ b/gas/config/tc-d10v.c
@@ -1,5 +1,5 @@
/* tc-d10v.c -- Assembler code for the Mitsubishi D10V
- Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006
+ Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
@@ -1440,7 +1440,6 @@ do_assemble (char *str, struct d10v_opcode **opcode)
char name[20];
int nlen = 0;
expressionS myops[6];
- unsigned long insn;
/* Drop leading whitespace. */
while (*str == ' ')
@@ -1462,7 +1461,7 @@ do_assemble (char *str, struct d10v_opcode **opcode)
/* Find the first opcode with the proper name. */
*opcode = (struct d10v_opcode *) hash_find (d10v_hash, name);
if (*opcode == NULL)
- as_fatal (_("unknown opcode: %s"), name);
+ return -1;
save = input_line_pointer;
input_line_pointer = (char *) op_end;
@@ -1471,8 +1470,7 @@ do_assemble (char *str, struct d10v_opcode **opcode)
return -1;
input_line_pointer = save;
- insn = build_insn ((*opcode), myops, 0);
- return insn;
+ return build_insn ((*opcode), myops, 0);
}
/* If while processing a fixup, a reloc really needs to be created.
@@ -1778,7 +1776,7 @@ md_assemble (char *str)
prev_seg = now_seg;
prev_subseg = now_subseg;
if (prev_insn == (unsigned long) -1)
- as_fatal (_("can't find opcode "));
+ as_fatal (_("can't find previous opcode "));
fixups = fixups->next;
str = str2 + 2;
}
@@ -1788,11 +1786,10 @@ md_assemble (char *str)
if (insn == (unsigned long) -1)
{
if (extype != PACK_UNSPEC)
- {
- etype = extype;
- return;
- }
- as_fatal (_("can't find opcode "));
+ etype = extype;
+ else
+ as_bad (_("could not assemble: %s"), str);
+ return;
}
if (etype != PACK_UNSPEC)