Merge https://github.com/YosysHQ/yosys into dff_init
authorEddie Hung <eddieh@ece.ubc.ca>
Sun, 17 Feb 2019 19:49:06 +0000 (11:49 -0800)
committerEddie Hung <eddieh@ece.ubc.ca>
Sun, 17 Feb 2019 19:49:06 +0000 (11:49 -0800)
1  2 
backends/verilog/verilog_backend.cc
tests/tools/autotest.sh

Simple merge
index 800fa3ad52775728c2ec691de3d7821dc05fe0ab,218edf931786f71fa4157308c1f902550a640f24..6fdd1e80af1c7e2a1594089689214af06994a509
@@@ -22,7 -28,7 +28,7 @@@ if [ ! -f $toolsdir/cmp_tbdata -o $tool
        ( set -ex; ${CC:-gcc} -Wall -o $toolsdir/cmp_tbdata $toolsdir/cmp_tbdata.c; ) || exit 1
  fi
  
- while getopts xmGl:wkjvref:s:p:n:S:I:B: opt; do
 -while getopts xmGl:wkjvref:s:p:n:S:I:-: opt; do
++while getopts xmGl:wkjvref:s:p:n:S:I:B:-: opt; do
        case "$opt" in
                x)
                        use_xsim=true ;;
                        include_opts="$include_opts -I $OPTARG"
                        xinclude_opts="$xinclude_opts -i $OPTARG"
                        minclude_opts="$minclude_opts +incdir+$OPTARG" ;;
 +        B)
 +                      backend_opts="$backend_opts $OPTARG" ;;
+               -)
+                       case "${OPTARG}" in
+                           xfirrtl)
+                               xfirrtl="${!OPTIND}"
+                               OPTIND=$(( $OPTIND + 1 ))
+                               ;;
+                           firrtl2verilog)
+                               firrtl2verilog="${!OPTIND}"
+                               OPTIND=$(( $OPTIND + 1 ))
+                               ;;
+                           *)
+                               if [ "$OPTERR" == 1 ] && [ "${optspec:0:1}" != ":" ]; then
+                                   echo "Unknown option --${OPTARG}" >&2
+                               fi
+                               ;;
+                       esac;;
                *)
-                       echo "Usage: $0 [-x|-m] [-G] [-w] [-k] [-j] [-v] [-r] [-e] [-l libs] [-f frontend] [-s script] [-p cmdstring] [-n iters] [-S seed] [-I incdir] [-B backend_opt] verilog-files\n" >&2
 -                      echo "Usage: $0 [-x|-m] [-G] [-w] [-k] [-j] [-v] [-r] [-e] [-l libs] [-f frontend] [-s script] [-p cmdstring] [-n iters] [-S seed] [-I incdir] [--xfirrtl FIRRTL test exclude file] [--firrtl2verilog command to generate verilog from firrtl] verilog-files\n" >&2
++                      echo "Usage: $0 [-x|-m] [-G] [-w] [-k] [-j] [-v] [-r] [-e] [-l libs] [-f frontend] [-s script] [-p cmdstring] [-n iters] [-S seed] [-I incdir] [-B backend_opt] [--xfirrtl FIRRTL test exclude file] [--firrtl2verilog command to generate verilog from firrtl] verilog-files\n" >&2
                        exit 1
        esac
  done