mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
7b4ae82428
bfd * Makefile.am: Add s12z files. * Makefile.in: Regenerate. * archures.c: Add bfd_s12z_arch. * bfd-in.h: Add exports of bfd_putb24 and bfd_putl24. * bfd-in2.h: Regenerate. * config.bfd: Add s12z target. * configure.ac: Add s12z target. * configure: Regenerate. * cpu-s12z.c: New file. * elf32-s12z.c: New file. * libbfd.c (bfd_putb24): New function. (bfd_putl24): New function. * libbfd.h: Regenerate. * reloc.c: Add s12z relocations. (bfd_get_reloc_size): Handle size 5 relocs. * targets.c: Add s12z_elf32_vec. opcodes * Makefile.am: Add support for s12z architecture. * configure.ac: Likewise. * disassemble.c: Likewise. * disassemble.h: Likewise. * Makefile.in: Regenerate. * configure: Regenerate. * s12z-dis.c: New file. * s12z.h: New file. include * elf/s12z.h: New header. ld * Makefile.am: Add support for s12z architecture. * configure.tgt: Likewise. * Makefile.in: Regenerate. * emulparams/m9s12zelf.sh: New file. * scripttempl/elfm9s12z.sc: New file. * testsuite/ld-discard/static.d: Expect to fail for the s12z target. * testsuite/ld-elf/endsym.d: Likewise. * testsuite/ld-elf/merge.d: Likewise. * testsuite/ld-elf/pr14926.d: Skip for the s12z target. * testsuite/ld-elf/sec64k.exp: Likewise. * testsuite/ld-s12z: New directory. * testsuite/ld-s12z/opr-linking.d: New file. * testsuite/ld-s12z/opr-linking.s: New file. * testsuite/ld-s12z/relative-linking.d: New file. * testsuite/ld-s12z/relative-linking.s: New file. * testsuite/ld-s12z/z12s.exp: New file. gas * Makefile.am: Add support for s12z target. * Makefile.in: Regenerate. * NEWS: Mention the new support. * config/tc-s12z.c: New file. * config/tc-s12z.h: New file. * configure.tgt: Add s12z support. * doc/Makefile.am: Likewise. * doc/Makefile.in: Regenerate. * doc/all.texi: Add s12z documentation. * doc/as.textinfo: Likewise. * doc/c-s12z.texi: New file. * testsuite/gas/s12z: New directory. * testsuite/gas/s12z/abs.d: New file. * testsuite/gas/s12z/abs.s: New file. * testsuite/gas/s12z/adc-imm.d: New file. * testsuite/gas/s12z/adc-imm.s: New file. * testsuite/gas/s12z/adc-opr.d: New file. * testsuite/gas/s12z/adc-opr.s: New file. * testsuite/gas/s12z/add-imm.d: New file. * testsuite/gas/s12z/add-imm.s: New file. * testsuite/gas/s12z/add-opr.d: New file. * testsuite/gas/s12z/add-opr.s: New file. * testsuite/gas/s12z/and-imm.d: New file. * testsuite/gas/s12z/and-imm.s: New file. * testsuite/gas/s12z/and-opr.d: New file. * testsuite/gas/s12z/and-opr.s: New file. * testsuite/gas/s12z/and-or-cc.d: New file. * testsuite/gas/s12z/and-or-cc.s: New file. * testsuite/gas/s12z/bfext-special.d: New file. * testsuite/gas/s12z/bfext-special.s: New file. * testsuite/gas/s12z/bfext.d: New file. * testsuite/gas/s12z/bfext.s: New file. * testsuite/gas/s12z/bit-manip.d: New file. * testsuite/gas/s12z/bit-manip.s: New file. * testsuite/gas/s12z/bit.d: New file. * testsuite/gas/s12z/bit.s: New file. * testsuite/gas/s12z/bra-expression-defined.d: New file. * testsuite/gas/s12z/bra-expression-defined.s: New file. * testsuite/gas/s12z/bra-expression-undef.d: New file. * testsuite/gas/s12z/bra-expression-undef.s: New file. * testsuite/gas/s12z/bra.d: New file. * testsuite/gas/s12z/bra.s: New file. * testsuite/gas/s12z/brclr-symbols.d: New file. * testsuite/gas/s12z/brclr-symbols.s: New file. * testsuite/gas/s12z/brset-clr-opr-imm-rel.d: New file. * testsuite/gas/s12z/brset-clr-opr-imm-rel.s: New file. * testsuite/gas/s12z/brset-clr-opr-reg-rel.d: New file. * testsuite/gas/s12z/brset-clr-opr-reg-rel.s: New file. * testsuite/gas/s12z/brset-clr-reg-imm-rel.d: New file. * testsuite/gas/s12z/brset-clr-reg-imm-rel.s: New file. * testsuite/gas/s12z/brset-clr-reg-reg-rel.d: New file. * testsuite/gas/s12z/brset-clr-reg-reg-rel.s: New file. * testsuite/gas/s12z/clb.d: New file. * testsuite/gas/s12z/clb.s: New file. * testsuite/gas/s12z/clr-opr.d: New file. * testsuite/gas/s12z/clr-opr.s: New file. * testsuite/gas/s12z/clr.d: New file. * testsuite/gas/s12z/clr.s: New file. * testsuite/gas/s12z/cmp-imm.d: New file. * testsuite/gas/s12z/cmp-imm.s: New file. * testsuite/gas/s12z/cmp-opr-inc.d: New file. * testsuite/gas/s12z/cmp-opr-inc.s: New file. * testsuite/gas/s12z/cmp-opr-rdirect.d: New file. * testsuite/gas/s12z/cmp-opr-rdirect.s: New file. * testsuite/gas/s12z/cmp-opr-reg.d: New file. * testsuite/gas/s12z/cmp-opr-reg.s: New file. * testsuite/gas/s12z/cmp-opr-rindirect.d: New file. * testsuite/gas/s12z/cmp-opr-rindirect.s: New file. * testsuite/gas/s12z/cmp-opr-sxe4.d: New file. * testsuite/gas/s12z/cmp-opr-sxe4.s: New file. * testsuite/gas/s12z/cmp-opr-xys.d: New file. * testsuite/gas/s12z/cmp-opr-xys.s: New file. * testsuite/gas/s12z/cmp-s-imm.d: New file. * testsuite/gas/s12z/cmp-s-imm.s: New file. * testsuite/gas/s12z/cmp-s-opr.d: New file. * testsuite/gas/s12z/cmp-s-opr.s: New file. * testsuite/gas/s12z/cmp-xy.d: New file. * testsuite/gas/s12z/cmp-xy.s: New file. * testsuite/gas/s12z/com-opr.d: New file. * testsuite/gas/s12z/com-opr.s: New file. * testsuite/gas/s12z/complex-shifts.d: New file. * testsuite/gas/s12z/complex-shifts.s: New file. * testsuite/gas/s12z/db-tb-cc-opr.d: New file. * testsuite/gas/s12z/db-tb-cc-opr.s: New file. * testsuite/gas/s12z/db-tb-cc-reg.d: New file. * testsuite/gas/s12z/db-tb-cc-reg.s: New file. * testsuite/gas/s12z/dbCC.d: New file. * testsuite/gas/s12z/dbCC.s: New file. * testsuite/gas/s12z/dec-opr.d: New file. * testsuite/gas/s12z/dec-opr.s: New file. * testsuite/gas/s12z/dec.d: New file. * testsuite/gas/s12z/dec.s: New file. * testsuite/gas/s12z/div.d: New file. * testsuite/gas/s12z/div.s: New file. * testsuite/gas/s12z/eor.d: New file. * testsuite/gas/s12z/eor.s: New file. * testsuite/gas/s12z/exg.d: New file. * testsuite/gas/s12z/exg.s: New file. * testsuite/gas/s12z/ext24-ld-xy.d: New file. * testsuite/gas/s12z/ext24-ld-xy.s: New file. * testsuite/gas/s12z/inc-opr.d: New file. * testsuite/gas/s12z/inc-opr.s: New file. * testsuite/gas/s12z/inc.d: New file. * testsuite/gas/s12z/inc.s: New file. * testsuite/gas/s12z/inh.d: New file. * testsuite/gas/s12z/inh.s: New file. * testsuite/gas/s12z/jmp.d: New file. * testsuite/gas/s12z/jmp.s: New file. * testsuite/gas/s12z/jsr.d: New file. * testsuite/gas/s12z/jsr.s: New file. * testsuite/gas/s12z/ld-imm-page2.d: New file. * testsuite/gas/s12z/ld-imm-page2.s: New file. * testsuite/gas/s12z/ld-imm.d: New file. * testsuite/gas/s12z/ld-imm.s: New file. * testsuite/gas/s12z/ld-immu18.d: New file. * testsuite/gas/s12z/ld-immu18.s: New file. * testsuite/gas/s12z/ld-large-direct.d: New file. * testsuite/gas/s12z/ld-large-direct.s: New file. * testsuite/gas/s12z/ld-opr.d: New file. * testsuite/gas/s12z/ld-opr.s: New file. * testsuite/gas/s12z/ld-s-opr.d: New file. * testsuite/gas/s12z/ld-s-opr.s: New file. * testsuite/gas/s12z/ld-small-direct.d: New file. * testsuite/gas/s12z/ld-small-direct.s: New file. * testsuite/gas/s12z/lea-immu18.d: New file. * testsuite/gas/s12z/lea-immu18.s: New file. * testsuite/gas/s12z/lea.d: New file. * testsuite/gas/s12z/lea.s: New file. * testsuite/gas/s12z/mac.d: New file. * testsuite/gas/s12z/mac.s: New file. * testsuite/gas/s12z/min-max.d: New file. * testsuite/gas/s12z/min-max.s: New file. * testsuite/gas/s12z/mod.d: New file. * testsuite/gas/s12z/mod.s: New file. * testsuite/gas/s12z/mov.d: New file. * testsuite/gas/s12z/mov.s: New file. * testsuite/gas/s12z/mul-imm.d: New file. * testsuite/gas/s12z/mul-imm.s: New file. * testsuite/gas/s12z/mul-opr-opr.d: New file. * testsuite/gas/s12z/mul-opr-opr.s: New file. * testsuite/gas/s12z/mul-opr.d: New file. * testsuite/gas/s12z/mul-opr.s: New file. * testsuite/gas/s12z/mul-reg.d: New file. * testsuite/gas/s12z/mul-reg.s: New file. * testsuite/gas/s12z/mul.d: New file. * testsuite/gas/s12z/mul.s: New file. * testsuite/gas/s12z/neg-opr.d: New file. * testsuite/gas/s12z/neg-opr.s: New file. * testsuite/gas/s12z/not-so-simple-shifts.d: New file. * testsuite/gas/s12z/not-so-simple-shifts.s: New file. * testsuite/gas/s12z/opr-18u.d: New file. * testsuite/gas/s12z/opr-18u.s: New file. * testsuite/gas/s12z/opr-expr.d: New file. * testsuite/gas/s12z/opr-expr.s: New file. * testsuite/gas/s12z/opr-ext-18.d: New file. * testsuite/gas/s12z/opr-ext-18.s: New file. * testsuite/gas/s12z/opr-idx-24-reg.d: New file. * testsuite/gas/s12z/opr-idx-24-reg.s: New file. * testsuite/gas/s12z/opr-idx3-reg.d: New file. * testsuite/gas/s12z/opr-idx3-reg.s: New file. * testsuite/gas/s12z/opr-idx3-xysp-24.d: New file. * testsuite/gas/s12z/opr-idx3-xysp-24.s: New file. * testsuite/gas/s12z/opr-indirect-expr.d: New file. * testsuite/gas/s12z/opr-indirect-expr.s: New file. * testsuite/gas/s12z/opr-symbol.d: New file. * testsuite/gas/s12z/opr-symbol.s: New file. * testsuite/gas/s12z/or-imm.d: New file. * testsuite/gas/s12z/or-imm.s: New file. * testsuite/gas/s12z/or-opr.d: New file. * testsuite/gas/s12z/or-opr.s: New file. * testsuite/gas/s12z/p2-mul.d: New file. * testsuite/gas/s12z/p2-mul.s: New file. * testsuite/gas/s12z/page2-inh.d: New file. * testsuite/gas/s12z/page2-inh.s: New file. * testsuite/gas/s12z/psh-pul.d: New file. * testsuite/gas/s12z/psh-pul.s: New file. * testsuite/gas/s12z/qmul.d: New file. * testsuite/gas/s12z/qmul.s: New file. * testsuite/gas/s12z/rotate.d: New file. * testsuite/gas/s12z/rotate.s: New file. * testsuite/gas/s12z/s12z.exp: New file. * testsuite/gas/s12z/sat.d: New file. * testsuite/gas/s12z/sat.s: New file. * testsuite/gas/s12z/sbc-imm.d: New file. * testsuite/gas/s12z/sbc-imm.s: New file. * testsuite/gas/s12z/sbc-opr.d: New file. * testsuite/gas/s12z/sbc-opr.s: New file. * testsuite/gas/s12z/shift.d: New file. * testsuite/gas/s12z/shift.s: New file. * testsuite/gas/s12z/simple-shift.d: New file. * testsuite/gas/s12z/simple-shift.s: New file. * testsuite/gas/s12z/single-ops.d: New file. * testsuite/gas/s12z/single-ops.s: New file. * testsuite/gas/s12z/specd6.d: New file. * testsuite/gas/s12z/specd6.s: New file. * testsuite/gas/s12z/st-large-direct.d: New file. * testsuite/gas/s12z/st-large-direct.s: New file. * testsuite/gas/s12z/st-opr.d: New file. * testsuite/gas/s12z/st-opr.s: New file. * testsuite/gas/s12z/st-s-opr.d: New file. * testsuite/gas/s12z/st-s-opr.s: New file. * testsuite/gas/s12z/st-small-direct.d: New file. * testsuite/gas/s12z/st-small-direct.s: New file. * testsuite/gas/s12z/st-xy.d: New file. * testsuite/gas/s12z/st-xy.s: New file. * testsuite/gas/s12z/sub-imm.d: New file. * testsuite/gas/s12z/sub-imm.s: New file. * testsuite/gas/s12z/sub-opr.d: New file. * testsuite/gas/s12z/sub-opr.s: New file. * testsuite/gas/s12z/tfr.d: New file. * testsuite/gas/s12z/tfr.s: New file. * testsuite/gas/s12z/trap.d: New file. * testsuite/gas/s12z/trap.s: New file. binutils* readelf.c: Add support for s12z architecture. * testsuite/lib/binutils-common.exp (is_elf_format): Excluse s12z targets.
378 lines
10 KiB
Plaintext
378 lines
10 KiB
Plaintext
# Copyright (C) 1993-2018 Free Software Foundation, Inc.
|
|
#
|
|
# This file is part of the GNU Binutils.
|
|
#
|
|
# This file 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 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
# MA 02110-1301, USA.
|
|
|
|
# True if the object format is known to be ELF.
|
|
#
|
|
proc is_elf_format {} {
|
|
# config.sub for these targets curiously transforms a target doublet
|
|
# ending in -elf to -none. eg. m68hc12-elf to m68hc12-unknown-none
|
|
# They are always elf.
|
|
if { [istarget m68hc1*-*] || [istarget s12z*-*] || [istarget xgate-*] } {
|
|
return 1;
|
|
}
|
|
# vxworks (and windiss) excluded due to number of ELF tests that need
|
|
# modifying to pass on those targets.
|
|
# && ![istarget *-*-vxworks*]
|
|
# && ![istarget *-*-windiss*]
|
|
|
|
if { ![istarget *-*-chorus*]
|
|
&& ![istarget *-*-cloudabi*]
|
|
&& ![istarget *-*-eabi*]
|
|
&& ![istarget *-*-*elf*]
|
|
&& ![istarget *-*-*freebsd*]
|
|
&& ![istarget *-*-fuchsia*]
|
|
&& ![istarget *-*-gnu*]
|
|
&& ![istarget *-*-irix5*]
|
|
&& ![istarget *-*-irix6*]
|
|
&& ![istarget *-*-kaos*]
|
|
&& ![istarget *-*-*linux*]
|
|
&& ![istarget *-*-lynxos*]
|
|
&& ![istarget *-*-nacl*]
|
|
&& ![istarget *-*-netbsd*]
|
|
&& ![istarget *-*-nto*]
|
|
&& ![istarget *-*-openbsd*]
|
|
&& ![istarget *-*-rtems*]
|
|
&& ![istarget *-*-solaris2*]
|
|
&& ![istarget *-*-sysv4*]
|
|
&& ![istarget *-*-unixware*]
|
|
&& ![istarget *-*-wasm32*]
|
|
&& ![istarget avr-*-*]
|
|
&& ![istarget hppa*64*-*-hpux*]
|
|
&& ![istarget ia64-*-hpux*] } {
|
|
return 0
|
|
}
|
|
|
|
if { [istarget *-*-linux*ecoff*]
|
|
|| [istarget *-*-rtemscoff*] } {
|
|
return 0
|
|
}
|
|
|
|
if { ![istarget *-*-netbsdelf*]
|
|
&& ( [istarget vax-*-netbsd*]
|
|
|| [istarget ns32k-*-netbsd*]) } {
|
|
return 0
|
|
}
|
|
|
|
if { [istarget arm-*-openbsd*]
|
|
|| [istarget ns32k-*-openbsd*]
|
|
|| [istarget vax-*-openbsd*] } {
|
|
return 0
|
|
}
|
|
|
|
return 1
|
|
}
|
|
|
|
# True if the object format is known to be a.out.
|
|
#
|
|
proc is_aout_format {} {
|
|
if { [istarget *-*-*aout*]
|
|
|| [istarget *-*-bsd*]
|
|
|| [istarget *-*-msdos*]
|
|
|| [istarget ns32k-*-*]
|
|
|| [istarget pdp11-*-*]
|
|
|| [istarget vax-*-netbsd] } {
|
|
return 1
|
|
}
|
|
return 0
|
|
}
|
|
|
|
# True if the object format is known to be PE COFF.
|
|
#
|
|
proc is_pecoff_format {} {
|
|
if { ![istarget *-*-mingw*]
|
|
&& ![istarget *-*-cygwin*]
|
|
&& ![istarget *-*-cegcc*]
|
|
&& ![istarget *-*-pe*] } {
|
|
return 0
|
|
}
|
|
|
|
return 1
|
|
}
|
|
|
|
# True if the object format is known to be 64-bit ELF.
|
|
#
|
|
proc is_elf64 { binary_file } {
|
|
global READELF
|
|
global READELFFLAGS
|
|
|
|
set readelf_size ""
|
|
catch "exec $READELF $READELFFLAGS -h $binary_file > readelf.out" got
|
|
|
|
if ![string match "" $got] then {
|
|
return 0
|
|
}
|
|
|
|
if { ![regexp "\n\[ \]*Class:\[ \]*ELF(\[0-9\]+)\n" \
|
|
[file_contents readelf.out] nil readelf_size] } {
|
|
return 0
|
|
}
|
|
|
|
if { $readelf_size == "64" } {
|
|
return 1
|
|
}
|
|
|
|
return 0
|
|
}
|
|
|
|
# True if the target matches TARGET, specified as a TCL procedure if
|
|
# in square brackets or as machine triplet otherwise.
|
|
#
|
|
proc match_target { target } {
|
|
if [string match {\[*\]} $target] {
|
|
return $target
|
|
} else {
|
|
return [istarget $target]
|
|
}
|
|
}
|
|
|
|
# True if the ELF target supports STB_GNU_UNIQUE with the ELF header's
|
|
# OSABI field set to ELFOSABI_GNU.
|
|
#
|
|
# This generally depends on the target OS only, however there are a
|
|
# number of exceptions for bare metal targets as follows. The MSP430
|
|
# and Visium targets set OSABI to ELFOSABI_STANDALONE and cannot
|
|
# support STB_GNU_UNIQUE. Likewise non-EABI ARM targets set OSABI to
|
|
# ELFOSABI_ARM, and TI C6X targets to ELFOSABI_C6000_*. Finally
|
|
# rather than `bfd_elf_final_link' AM33/2.0, D30V, DLX, and
|
|
# picoJava targets use `_bfd_generic_final_link', which does not
|
|
# support STB_GNU_UNIQUE symbol binding causing assertion failures.
|
|
#
|
|
proc supports_gnu_unique {} {
|
|
if { [istarget *-*-gnu*]
|
|
|| [istarget *-*-linux*]
|
|
|| [istarget *-*-nacl*] } {
|
|
return 1
|
|
}
|
|
if { [istarget "arm*-*-*eabi*"] } {
|
|
return 1
|
|
}
|
|
if { [istarget "wasm32*-*-*"] } {
|
|
return 1
|
|
}
|
|
if { ![istarget "*-*-elf*"] } {
|
|
return 0
|
|
}
|
|
if { [istarget "arm*-*-*"]
|
|
|| [istarget "msp430-*-*"]
|
|
|| [istarget "tic6x-*-*"]
|
|
|| [istarget "visium-*-*"] } {
|
|
return 0
|
|
}
|
|
if { [istarget "am33_2.0-*-*"]
|
|
|| [istarget "d30v-*-*"]
|
|
|| [istarget "dlx-*-*"]
|
|
|| [istarget "pj*-*-*"] } {
|
|
return 0
|
|
}
|
|
return 1
|
|
}
|
|
|
|
# True for targets that do not sort .symtab as per the ELF standard.
|
|
# ie. any that have mips_elf32_be_vec, mips_elf32_le_vec,
|
|
# mips_elf32_n_be_vec or mips_elf32_n_le_vec as the primary bfd target
|
|
# vector in config.bfd. When syncing with config.bfd, don't forget that
|
|
# earlier case-matches trump later ones.
|
|
proc is_bad_symtab {} {
|
|
if { ![istarget "mips*-*-*"] } {
|
|
return 0;
|
|
}
|
|
if { [istarget "*-*-chorus*"]
|
|
|| [istarget "*-*-irix5*"]
|
|
|| [istarget "*-*-irix6*"]
|
|
|| [istarget "*-*-none"]
|
|
|| [istarget "*-*-rtems*"]
|
|
|| [istarget "*-*-windiss"] } {
|
|
return 1;
|
|
}
|
|
if { [istarget "*-*-elf*"]
|
|
&& ![istarget "*-sde-*"]
|
|
&& ![istarget "*-mti-*"]
|
|
&& ![istarget "*-img-*"] } {
|
|
return 1;
|
|
}
|
|
if { [istarget "*-*-openbsd*"]
|
|
&& ![istarget "mips64*-*-*"] } {
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
# Compare two files line-by-line. FILE_1 is the actual output and FILE_2
|
|
# is the expected output. Ignore blank lines in either file.
|
|
#
|
|
# FILE_2 is a series of regexps, comments and # directives. The directives
|
|
# are:
|
|
#
|
|
# #pass
|
|
# Treat the test as a PASS if everything up till this point has
|
|
# matched. Ignore any remaining lines in either FILE_1 or FILE_2.
|
|
#
|
|
# #failif
|
|
# Reverse the sense of the test: expect differences to exist.
|
|
#
|
|
# #...
|
|
# REGEXP
|
|
# Skip all lines in FILE_1 until the first that matches REGEXP.
|
|
#
|
|
# Other # lines are comments. Regexp lines starting with the `!' character
|
|
# specify inverse matching (use `\!' for literal matching against a leading
|
|
# `!'). Skip empty lines in both files.
|
|
#
|
|
# The first optional argument is a list of regexp substitutions of the form:
|
|
#
|
|
# EXP1 SUBSPEC1 EXP2 SUBSPEC2 ...
|
|
#
|
|
# This tells the function to apply each regexp substitution EXPi->SUBSPECi
|
|
# in order to every line of FILE_2.
|
|
#
|
|
# Return nonzero if differences exist.
|
|
proc regexp_diff { file_1 file_2 args } {
|
|
set eof -1
|
|
set end_1 0
|
|
set end_2 0
|
|
set differences 0
|
|
set diff_pass 0
|
|
set fail_if_match 0
|
|
set ref_subst ""
|
|
if { [llength $args] > 0 } {
|
|
set ref_subst [lindex $args 0]
|
|
}
|
|
if { [llength $args] > 1 } {
|
|
perror "Too many arguments to regexp_diff"
|
|
return 1
|
|
}
|
|
|
|
if [file exists $file_1] then {
|
|
set file_a [open $file_1 r]
|
|
} else {
|
|
perror "$file_1 doesn't exist"
|
|
return 1
|
|
}
|
|
|
|
if [file exists $file_2] then {
|
|
set file_b [open $file_2 r]
|
|
} else {
|
|
perror "$file_2 doesn't exist"
|
|
close $file_a
|
|
return 1
|
|
}
|
|
|
|
verbose " Regexp-diff'ing: $file_1 $file_2" 2
|
|
|
|
while { 1 } {
|
|
set line_a ""
|
|
set line_b ""
|
|
while { [string length $line_a] == 0 } {
|
|
# Ignore blank line in FILE_1.
|
|
if { [gets $file_a line_a] == $eof } {
|
|
set end_1 1
|
|
break
|
|
}
|
|
}
|
|
while { [string length $line_b] == 0 || [string match "#*" $line_b] } {
|
|
if { [string match "#pass" $line_b] } {
|
|
set end_2 1
|
|
set diff_pass 1
|
|
break
|
|
} elseif { [string match "#failif" $line_b] } {
|
|
send_log "fail if no difference\n"
|
|
verbose "fail if no difference" 3
|
|
set fail_if_match 1
|
|
} elseif { [string match "#..." $line_b] } {
|
|
if { [gets $file_b line_b] == $eof } {
|
|
set end_2 1
|
|
set diff_pass 1
|
|
break
|
|
}
|
|
set negated [expr { [string index $line_b 0] == "!" }]
|
|
set line_bx [string range $line_b $negated end]
|
|
set n [expr { $negated ? "! " : "" }]
|
|
# Substitute on the reference.
|
|
foreach {name value} $ref_subst {
|
|
regsub -- $name $line_bx $value line_bx
|
|
}
|
|
verbose "looking for $n\"^$line_bx$\"" 3
|
|
while { [expr [regexp "^$line_bx$" "$line_a"] == $negated] } {
|
|
verbose "skipping \"$line_a\"" 3
|
|
if { [gets $file_a line_a] == $eof } {
|
|
set end_1 1
|
|
break
|
|
}
|
|
}
|
|
break
|
|
}
|
|
if { [gets $file_b line_b] == $eof } {
|
|
set end_2 1
|
|
break
|
|
}
|
|
}
|
|
|
|
if { $diff_pass } {
|
|
break
|
|
} elseif { $end_1 && $end_2 } {
|
|
break
|
|
} elseif { $end_1 } {
|
|
send_log "extra regexps in $file_2 starting with \"^$line_b$\"\nEOF from $file_1\n"
|
|
verbose "extra regexps in $file_2 starting with \"^$line_b$\"\nEOF from $file_1" 3
|
|
set differences 1
|
|
break
|
|
} elseif { $end_2 } {
|
|
send_log "extra lines in $file_1 starting with \"^$line_a$\"\nEOF from $file_2\n"
|
|
verbose "extra lines in $file_1 starting with \"^$line_a$\"\nEOF from $file_2\n" 3
|
|
set differences 1
|
|
break
|
|
} else {
|
|
set negated [expr { [string index $line_b 0] == "!" }]
|
|
set line_bx [string range $line_b $negated end]
|
|
set n [expr { $negated ? "! " : "" }]
|
|
set s [expr { $negated ? " " : "" }]
|
|
# Substitute on the reference.
|
|
foreach {name value} $ref_subst {
|
|
regsub -- $name $line_bx $value line_bx
|
|
}
|
|
verbose "regexp $n\"^$line_bx$\"\nline \"$line_a\"" 3
|
|
if { [expr [regexp "^$line_bx$" "$line_a"] == $negated] } {
|
|
send_log "regexp_diff match failure\n"
|
|
send_log "regexp $n\"^$line_bx$\"\nline $s\"$line_a\"\n"
|
|
verbose "regexp_diff match failure\n" 3
|
|
set differences 1
|
|
}
|
|
}
|
|
}
|
|
|
|
if { $differences == 0 && !$diff_pass && [eof $file_a] != [eof $file_b] } {
|
|
send_log "$file_1 and $file_2 are different lengths\n"
|
|
verbose "$file_1 and $file_2 are different lengths" 3
|
|
set differences 1
|
|
}
|
|
|
|
if { $fail_if_match } {
|
|
if { $differences == 0 } {
|
|
set differences 1
|
|
} else {
|
|
set differences 0
|
|
}
|
|
}
|
|
|
|
close $file_a
|
|
close $file_b
|
|
|
|
return $differences
|
|
}
|