espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 17:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR gas/3797

Browse Source 
* 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.
This commit is contained in:
Nick Clifton
2007-02-28 18:38:51 +00:00
parent 35f196d907
commit c5d07591f7
42 changed files with 93 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -4,6 +4,12 @@
2007-02-28 Nick Clifton <nickc@redhat.com> 2007-02-28 Nick Clifton <nickc@redhat.com>
PR gas/3797
* config/tc-d10v.c (do_assemble): Do not generate error messages,
just return -1 whenever a problem is encountered.
(md_assemble): If do_assemble returns -1 generate a non-fatal
error message and return.
PR gas/2623 PR gas/2623
* config/tc-msp430.c (line_separator_char): Change to '{'. * config/tc-msp430.c (line_separator_char): Change to '{'.

19
gas/config/tc-d10v.c
View File

@ -1,5 +1,5 @@
/* tc-d10v.c -- Assembler code for the Mitsubishi D10V /* 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. Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler. This file is part of GAS, the GNU Assembler.
@ -1440,7 +1440,6 @@ do_assemble (char *str, struct d10v_opcode **opcode)
char name[20]; char name[20];
int nlen = 0; int nlen = 0;
expressionS myops[6]; expressionS myops[6];
unsigned long insn;
/* Drop leading whitespace. */ /* Drop leading whitespace. */
while (*str == ' ') while (*str == ' ')
@ -1462,7 +1461,7 @@ do_assemble (char *str, struct d10v_opcode **opcode)
/* Find the first opcode with the proper name. */ /* Find the first opcode with the proper name. */
*opcode = (struct d10v_opcode *) hash_find (d10v_hash, name); *opcode = (struct d10v_opcode *) hash_find (d10v_hash, name);
if (*opcode == NULL) if (*opcode == NULL)
as_fatal (_("unknown opcode: %s"), name); return -1;
save = input_line_pointer; save = input_line_pointer;
input_line_pointer = (char *) op_end; input_line_pointer = (char *) op_end;
@ -1471,8 +1470,7 @@ do_assemble (char *str, struct d10v_opcode **opcode)
return -1; return -1;
input_line_pointer = save; input_line_pointer = save;
insn = build_insn ((*opcode), myops, 0); return build_insn ((*opcode), myops, 0);
return insn;
} }
/* If while processing a fixup, a reloc really needs to be created. /* 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_seg = now_seg;
prev_subseg = now_subseg; prev_subseg = now_subseg;
if (prev_insn == (unsigned long) -1) if (prev_insn == (unsigned long) -1)
as_fatal (_("can't find opcode ")); as_fatal (_("can't find previous opcode "));
fixups = fixups->next; fixups = fixups->next;
str = str2 + 2; str = str2 + 2;
} }
@ -1788,11 +1786,10 @@ md_assemble (char *str)
if (insn == (unsigned long) -1) if (insn == (unsigned long) -1)
{ {
if (extype != PACK_UNSPEC) if (extype != PACK_UNSPEC)
{ etype = extype;
etype = extype; else
return; as_bad (_("could not assemble: %s"), str);
} return;
as_fatal (_("can't find opcode "));
} }
if (etype != PACK_UNSPEC) if (etype != PACK_UNSPEC)

27
gas/testsuite/ChangeLog
View File

@ -1,5 +1,32 @@
2007-02-28 Nick Clifton <nickc@redhat.com> 2007-02-28 Nick Clifton <nickc@redhat.com>
PR gas/3797
* 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.
2007-02-28 Nick Clifton <nickc@redhat.com>
PR gas/3975
* gas/arm/mapshort.d: Split into two new files... * gas/arm/mapshort.d: Split into two new files...
* gas/arm/mapshort-eabi.d: The one and... * gas/arm/mapshort-eabi.d: The one and...
* gas/arm/mapshort-elf.d: This one. * gas/arm/mapshort-elf.d: This one.

2
gas/testsuite/gas/d10v/address-002.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldb r0

3
gas/testsuite/gas/d10v/address-003.l
View File

@ -1,3 +1,4 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldub r0

2
gas/testsuite/gas/d10v/address-004.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: stb r0

2
gas/testsuite/gas/d10v/address-005.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldb r0

2
gas/testsuite/gas/d10v/address-006.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldub r0

2
gas/testsuite/gas/d10v/address-007.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: stb r0

2
gas/testsuite/gas/d10v/address-008.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldb r0

2
gas/testsuite/gas/d10v/address-009.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldub r0

2
gas/testsuite/gas/d10v/address-010.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ld r0

2
gas/testsuite/gas/d10v/address-011.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ld2w r0

2
gas/testsuite/gas/d10v/address-012.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: stb r0

2
gas/testsuite/gas/d10v/address-013.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: st r0

2
gas/testsuite/gas/d10v/address-014.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: st2w r0

2
gas/testsuite/gas/d10v/address-015.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldb r0

2
gas/testsuite/gas/d10v/address-016.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldub r0

2
gas/testsuite/gas/d10v/address-017.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ld r0

2
gas/testsuite/gas/d10v/address-018.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ld2w r0

2
gas/testsuite/gas/d10v/address-019.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: stb r0

2
gas/testsuite/gas/d10v/address-020.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: st r0

2
gas/testsuite/gas/d10v/address-021.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: st2w r0

2
gas/testsuite/gas/d10v/address-022.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldb r0

2
gas/testsuite/gas/d10v/address-023.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldub r0

2
gas/testsuite/gas/d10v/address-024.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: stb r0

2
gas/testsuite/gas/d10v/address-025.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldb r0

2
gas/testsuite/gas/d10v/address-026.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldub r0

2
gas/testsuite/gas/d10v/address-027.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: stb r0

2
gas/testsuite/gas/d10v/address-030.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldb r0

2
gas/testsuite/gas/d10v/address-031.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldub r0

2
gas/testsuite/gas/d10v/address-032.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ld r0

2
gas/testsuite/gas/d10v/address-033.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ld2w r0

2
gas/testsuite/gas/d10v/address-034.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: stb r0

2
gas/testsuite/gas/d10v/address-035.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: st r0

2
gas/testsuite/gas/d10v/address-036.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: st2w r0

2
gas/testsuite/gas/d10v/address-037.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldb r0

2
gas/testsuite/gas/d10v/address-038.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ldub r0

2
gas/testsuite/gas/d10v/address-039.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ld r0

2
gas/testsuite/gas/d10v/address-040.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: ld2w r0

2
gas/testsuite/gas/d10v/address-041.l
View File

@ -1,3 +1,3 @@
.*: Assembler messages: .*: Assembler messages:
.*:6: Error: bad opcode or operands .*:6: Error: bad opcode or operands
.*:6: Fatal error: can't find opcode .*:6: Error: could not assemble: stb r0

21
gas/testsuite/gas/lns/lns.exp
View File

@ -21,16 +21,21 @@ run_list_test "lns-diag-1" ""
# ??? Won't work on targets that don't have a bare "nop" insn. # ??? Won't work on targets that don't have a bare "nop" insn.
# Perhaps we could arrange for an include file or something that # Perhaps we could arrange for an include file or something that
# defined a macro... # defined a macro...
if { ![istarget ia64*-*-*] # Nor does it work on targets that do not generate line number
# information (d10v).
if {
![istarget d10v-*-*]
&& ![istarget ia64*-*-*]
&& ![istarget i370-*-*] && ![istarget i370-*-*]
&& ![istarget i960-*-*] && ![istarget i960-*-*]
&& ![istarget mcore-*-*] && ![istarget mcore-*-*]
&& ![istarget or32-*-*] && ![istarget or32-*-*]
&& ![istarget s390*-*-*] } { && ![istarget s390*-*-*]
# Use alternate file for targets using DW_LNS_fixed_advance_pc opcodes. } {
if { [istarget xtensa-*-*] } { # Use alternate file for targets using DW_LNS_fixed_advance_pc opcodes.
run_dump_test "lns-common-1-alt" if { [istarget xtensa-*-*] } {
} else { run_dump_test "lns-common-1-alt"
run_dump_test "lns-common-1" } else {
} run_dump_test "lns-common-1"
}
} }