[Pkg-electronics-commits] [gtkwave] 01/03: Imported Upstream version 3.3.54
أحمد المحمودي (Ahmed El-Mahmoudy)
aelmahmoudy at sabily.org
Thu Jan 9 13:48:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
aelmahmoudy-guest pushed a commit to branch master
in repository gtkwave.
commit 242acd4b2ba09d972230b0b8669e5097b5f679e2
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Thu Jan 9 14:43:22 2014 +0200
Imported Upstream version 3.3.54
---
ChangeLog | 10 +-
LICENSE.TXT | 2 +-
Makefile.in | 1 -
configure | 49 +--
configure.ac | 23 +-
contrib/Makefile.in | 1 -
contrib/bundle_for_osx/Info-gtkwave.plist | 6 +-
contrib/bundle_for_osx/Makefile.in | 1 -
contrib/fst_jni/Makefile.in | 1 -
contrib/pccts/IBM_VISUAL_AGE_PROJECTS/Makefile.in | 1 -
contrib/pccts/Makefile.in | 1 -
contrib/pccts/antlr/Makefile.in | 1 -
contrib/pccts/dlg/Makefile.in | 1 -
contrib/pccts/h/Makefile.in | 1 -
contrib/pccts/sorcerer/Makefile.in | 1 -
contrib/pccts/sorcerer/h/Makefile.in | 1 -
contrib/pccts/sorcerer/lib/Makefile.in | 1 -
contrib/pccts/sorcerer/test/Makefile.in | 1 -
contrib/pccts/sorcerer/test/test7/Makefile.in | 1 -
contrib/pccts/sorcerer/testcpp/Makefile.in | 1 -
contrib/pccts/support/DECmms/Makefile.in | 1 -
contrib/pccts/support/Makefile.in | 1 -
contrib/pccts/support/genmk/Makefile.in | 1 -
contrib/pccts/support/rexpr/Makefile.in | 1 -
contrib/pccts/support/set/Makefile.in | 1 -
contrib/pccts/support/sym/Makefile.in | 1 -
contrib/pccts/testcpp/Makefile.in | 1 -
contrib/rtlbrowse/Makefile.am | 2 +-
contrib/rtlbrowse/Makefile.in | 3 +-
contrib/vermin/Makefile.in | 1 -
contrib/wlf2vcd/Makefile | 419 ----------------------
contrib/wlf2vcd/Makefile.in | 1 -
doc/Makefile.in | 1 -
examples/Makefile.in | 1 -
man/Makefile.in | 1 -
share/Makefile.in | 1 -
share/applications/Makefile.in | 1 -
share/icons/Makefile.in | 1 -
share/icons/gnome/16x16/Makefile.in | 1 -
share/icons/gnome/16x16/mimetypes/Makefile.in | 1 -
share/icons/gnome/32x32/Makefile.in | 1 -
share/icons/gnome/32x32/mimetypes/Makefile.in | 1 -
share/icons/gnome/48x48/Makefile.in | 1 -
share/icons/gnome/48x48/mimetypes/Makefile.in | 1 -
share/icons/gnome/Makefile.in | 1 -
share/mime/Makefile.in | 1 -
share/mime/packages/Makefile.in | 1 -
src/Makefile.am | 2 +-
src/Makefile.in | 3 +-
src/cocoa/Makefile.in | 1 -
src/helpers/Makefile.am | 2 +-
src/helpers/Makefile.in | 3 +-
src/helpers/fst/Makefile.in | 1 -
src/helpers/fst/block_format.txt | 7 +
src/helpers/fst/fstapi.c | 79 +++-
src/helpers/fst/fstapi.h | 1 +
src/helpers/fst/lz4.c | 12 +-
src/helpers/lxt2_read.c | 47 +--
src/helpers/v2l_debug.h | 6 +-
src/helpers/v2l_debug_lxt2.h | 6 +-
src/helpers/vzt_read.c | 46 +--
src/libbz2/Makefile.in | 1 -
src/liblzma/Makefile.in | 1 -
src/libz/Makefile.in | 1 -
src/lxt.c | 52 +--
src/treesearch_gtk2.c | 6 +-
66 files changed, 134 insertions(+), 696 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 871c1f0..79f7442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1412,4 +1412,12 @@
Added experimental wlf2vcd in contrib. It is not currently
compiled or used.
Corrected non-functional typos in documentation.
-
+3.3.54 02feb14 Added LZ4 double compression on hierarchy tree for FST when
+ hierarchy size exceeds 4MB.
+ Fix to regular expression filtering when +I+ form expressions
+ are encountered in the SST. Previously, the wrong value of
+ regex match was used on 32-bit architectures due to the
+ stack layout.
+ Removed --disable-inline-asm ./configure flag as inline
+ assembly has been removed because it is generating incorrectly
+ in some cases on x86_64.
diff --git a/LICENSE.TXT b/LICENSE.TXT
index 16c2205..dc93d57 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,6 +1,6 @@
##########################################################################
-GTKWave 3.3.53 Wave Viewer is Copyright (C) 1999-2014 Tony Bybell.
+GTKWave 3.3.54 Wave Viewer is Copyright (C) 1999-2014 Tony Bybell.
Portions of GTKWave are Copyright (C) 1999-2014 Udi Finkelstein.
Context support is Copyright (C) 2007-2014 Kermin Elliott Fleming.
Trace group support is Copyright (C) 2009-2014 Donald Baltus.
diff --git a/Makefile.in b/Makefile.in
index e8b6825..c932062 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -212,7 +212,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/configure b/configure
index 3e9a9fe..675d76d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gtkwave 3.3.53.
+# Generated by GNU Autoconf 2.69 for gtkwave 3.3.54.
#
# Report bugs to <bybell at rocketmail.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gtkwave'
PACKAGE_TARNAME='gtkwave'
-PACKAGE_VERSION='3.3.53'
-PACKAGE_STRING='gtkwave 3.3.53'
+PACKAGE_VERSION='3.3.54'
+PACKAGE_STRING='gtkwave 3.3.54'
PACKAGE_BUGREPORT='bybell at rocketmail.com'
PACKAGE_URL=''
@@ -723,7 +723,6 @@ TCL_BIN_DIR
TCL_PATCH_LEVEL
TCL_VERSION
STRUCT_PACK
-INLINE_ASM
FDO_MIME_FALSE
FDO_MIME_TRUE
UPDATE_DESKTOP_DATABASE
@@ -805,7 +804,6 @@ enable_maintainer_mode
with_gconf
with_xdgdatadir
enable_mime_update
-enable_inline_asm
enable_struct_pack
enable_tcl
with_tcl
@@ -1384,7 +1382,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gtkwave 3.3.53 to adapt to many kinds of systems.
+\`configure' configures gtkwave 3.3.54 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1450,7 +1448,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gtkwave 3.3.53:";;
+ short | recursive ) echo "Configuration of gtkwave 3.3.54:";;
esac
cat <<\_ACEOF
@@ -1464,7 +1462,6 @@ Optional Features:
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
--disable-mime-update Disables MIME type and desktop/icon updating
- --disable-inline-asm Disables usage of inline x86 assembly
--enable-struct-pack Enables C language structure packing pragmas
intended for use on architectures which support
misaligned loads and stores (x86/x86_64/AVR32/
@@ -1596,7 +1593,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gtkwave configure 3.3.53
+gtkwave configure 3.3.54
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2240,7 +2237,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gtkwave $as_me 3.3.53, which was
+It was created by gtkwave $as_me 3.3.54, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3107,7 +3104,7 @@ fi
# Define the identity of the package.
PACKAGE='gtkwave'
- VERSION='3.3.53'
+ VERSION='3.3.54'
cat >>confdefs.h <<_ACEOF
@@ -3347,28 +3344,6 @@ fi
# Checks for build options
-# ------------- Inline -------------------
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if inline assembly should be enabled" >&5
-$as_echo_n "checking if inline assembly should be enabled... " >&6; }
-
-INL=yes
-INLINE_ASM=-DUSE_INLINE_ASM
-# Check whether --enable-inline_asm was given.
-if test "${enable_inline_asm+set}" = set; then :
- enableval=$enable_inline_asm;
-if test "X$enable_inline_asm" = "Xno" ; then
- INL=no
- INLINE_ASM=
-fi
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INL" >&5
-$as_echo "$INL" >&6; }
-
-
-
# ------------- Structure Packing -------------------
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if structure packing should be enabled" >&5
@@ -6897,7 +6872,7 @@ fi
if test "$have_liblzma" = "yes" ; then
as_fn_error $? "LZMA support for VZT is enabled, but xz could not be found.
-Please install xz, see the http://tukaani.org/xz website or use the --disable-xz flag." "$LINENO" 5
+Please install the xz-devel package, see the http://tukaani.org/xz website, or use the --disable-xz flag." "$LINENO" 5
fi
LIBXZ_LDADD='-llzma'
LIBXZ_CFLAGS='-D_WAVE_HAVE_XZ'
@@ -10361,7 +10336,6 @@ ac_config_files="$ac_config_files Makefile doc/Makefile contrib/Makefile contrib
CFLAGS : $CFLAGS
LDFLAGS : $LDFLAGS
LIBS : $LIBS
- INLINE_ASM : $INLINE_ASM
MINGW_LDADD : $MINGW_LDADD
GTK_MAC_CFLAGS : $GTK_MAC_CFLAGS
@@ -10423,7 +10397,6 @@ $as_echo "$as_me:
CFLAGS : $CFLAGS
LDFLAGS : $LDFLAGS
LIBS : $LIBS
- INLINE_ASM : $INLINE_ASM
MINGW_LDADD : $MINGW_LDADD
GTK_MAC_CFLAGS : $GTK_MAC_CFLAGS
@@ -10984,7 +10957,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gtkwave $as_me 3.3.53, which was
+This file was extended by gtkwave $as_me 3.3.54, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11050,7 +11023,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gtkwave config.status 3.3.53
+gtkwave config.status 3.3.54
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 28ad63e..e3dadf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(gtkwave, 3.3.53, bybell at rocketmail.com)
+AC_INIT(gtkwave, 3.3.54, bybell at rocketmail.com)
AC_CONFIG_SRCDIR([src/vcd.c])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADER([config.h])
@@ -76,24 +76,6 @@ fi
# Checks for build options
-# ------------- Inline -------------------
-
-AC_MSG_CHECKING([if inline assembly should be enabled])
-
-INL=yes
-INLINE_ASM=-DUSE_INLINE_ASM
-AC_ARG_ENABLE([inline_asm],
-[ --disable-inline-asm Disables usage of inline x86 assembly],
-[
-if test "X$enable_inline_asm" = "Xno" ; then
- INL=no
- INLINE_ASM=
-fi
-])
-AC_MSG_RESULT([$INL])
-AC_SUBST(INLINE_ASM)
-
-
# ------------- Structure Packing -------------------
AC_MSG_CHECKING([if structure packing should be enabled])
@@ -595,7 +577,7 @@ if test "X$EXZ" == "Xyes"; then
AC_CHECK_LIB([lzma], [lzma_end], [LIBLZMA_LDADD=-llzma] , [have_liblzma=yes])
if test "$have_liblzma" = "yes" ; then
AC_MSG_ERROR([LZMA support for VZT is enabled, but xz could not be found.
-Please install xz, see the http://tukaani.org/xz website or use the --disable-xz flag.])
+Please install the xz-devel package, see the http://tukaani.org/xz website, or use the --disable-xz flag.])
fi
LIBXZ_LDADD='-llzma'
LIBXZ_CFLAGS='-D_WAVE_HAVE_XZ'
@@ -950,7 +932,6 @@ AC_MSG_NOTICE([
CFLAGS : $CFLAGS
LDFLAGS : $LDFLAGS
LIBS : $LIBS
- INLINE_ASM : $INLINE_ASM
MINGW_LDADD : $MINGW_LDADD
GTK_MAC_CFLAGS : $GTK_MAC_CFLAGS
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index c6b8974..f339c35 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/bundle_for_osx/Info-gtkwave.plist b/contrib/bundle_for_osx/Info-gtkwave.plist
index 1775c7b..0d7f802 100644
--- a/contrib/bundle_for_osx/Info-gtkwave.plist
+++ b/contrib/bundle_for_osx/Info-gtkwave.plist
@@ -8,7 +8,7 @@
<key>CFBundleExecutable</key>
<string>gtkwave</string>
<key>CFBundleGetInfoString</key>
- <string>3.3.53, (C) 1999-2014 Tony Bybell http://gtkwave.sourceforge.net</string>
+ <string>3.3.54, (C) 1999-2014 Tony Bybell http://gtkwave.sourceforge.net</string>
<key>CFBundleIconFile</key>
<string>gtkwave.icns</string>
<key>CFBundleIdentifier</key>
@@ -18,11 +18,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>3.3.53</string>
+ <string>3.3.54</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>3.3.53</string>
+ <string>3.3.54</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 1999 - 2014 Tony Bybell, GNU General Public License.</string>
<key>LSMinimumSystemVersion</key>
diff --git a/contrib/bundle_for_osx/Makefile.in b/contrib/bundle_for_osx/Makefile.in
index edda6fc..ca9bf4a 100644
--- a/contrib/bundle_for_osx/Makefile.in
+++ b/contrib/bundle_for_osx/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/fst_jni/Makefile.in b/contrib/fst_jni/Makefile.in
index b0629f0..78358e3 100644
--- a/contrib/fst_jni/Makefile.in
+++ b/contrib/fst_jni/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/IBM_VISUAL_AGE_PROJECTS/Makefile.in b/contrib/pccts/IBM_VISUAL_AGE_PROJECTS/Makefile.in
index df70ac7..fa2aa43 100644
--- a/contrib/pccts/IBM_VISUAL_AGE_PROJECTS/Makefile.in
+++ b/contrib/pccts/IBM_VISUAL_AGE_PROJECTS/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/Makefile.in b/contrib/pccts/Makefile.in
index 67ece1f..6cb6075 100644
--- a/contrib/pccts/Makefile.in
+++ b/contrib/pccts/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/antlr/Makefile.in b/contrib/pccts/antlr/Makefile.in
index 89cb943..765eac8 100644
--- a/contrib/pccts/antlr/Makefile.in
+++ b/contrib/pccts/antlr/Makefile.in
@@ -177,7 +177,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/dlg/Makefile.in b/contrib/pccts/dlg/Makefile.in
index 6b181e4..0c1dbaa 100644
--- a/contrib/pccts/dlg/Makefile.in
+++ b/contrib/pccts/dlg/Makefile.in
@@ -175,7 +175,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/h/Makefile.in b/contrib/pccts/h/Makefile.in
index 2c3cb93..e39997e 100644
--- a/contrib/pccts/h/Makefile.in
+++ b/contrib/pccts/h/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/sorcerer/Makefile.in b/contrib/pccts/sorcerer/Makefile.in
index f3af7ce..062efbe 100644
--- a/contrib/pccts/sorcerer/Makefile.in
+++ b/contrib/pccts/sorcerer/Makefile.in
@@ -217,7 +217,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/sorcerer/h/Makefile.in b/contrib/pccts/sorcerer/h/Makefile.in
index 01f1fc7..c3422fe 100644
--- a/contrib/pccts/sorcerer/h/Makefile.in
+++ b/contrib/pccts/sorcerer/h/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/sorcerer/lib/Makefile.in b/contrib/pccts/sorcerer/lib/Makefile.in
index ed45b7d..4b00c2f 100644
--- a/contrib/pccts/sorcerer/lib/Makefile.in
+++ b/contrib/pccts/sorcerer/lib/Makefile.in
@@ -132,7 +132,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/sorcerer/test/Makefile.in b/contrib/pccts/sorcerer/test/Makefile.in
index 2df23f0..e9f5757 100644
--- a/contrib/pccts/sorcerer/test/Makefile.in
+++ b/contrib/pccts/sorcerer/test/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/sorcerer/test/test7/Makefile.in b/contrib/pccts/sorcerer/test/test7/Makefile.in
index de1772e..116dff0 100644
--- a/contrib/pccts/sorcerer/test/test7/Makefile.in
+++ b/contrib/pccts/sorcerer/test/test7/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/sorcerer/testcpp/Makefile.in b/contrib/pccts/sorcerer/testcpp/Makefile.in
index 55e23ba..59f4b64 100644
--- a/contrib/pccts/sorcerer/testcpp/Makefile.in
+++ b/contrib/pccts/sorcerer/testcpp/Makefile.in
@@ -201,7 +201,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/support/DECmms/Makefile.in b/contrib/pccts/support/DECmms/Makefile.in
index 7f310f8..52bf04d 100644
--- a/contrib/pccts/support/DECmms/Makefile.in
+++ b/contrib/pccts/support/DECmms/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/support/Makefile.in b/contrib/pccts/support/Makefile.in
index 1ae8fc7..9580979 100644
--- a/contrib/pccts/support/Makefile.in
+++ b/contrib/pccts/support/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/support/genmk/Makefile.in b/contrib/pccts/support/genmk/Makefile.in
index fed39f0..4d42b40 100644
--- a/contrib/pccts/support/genmk/Makefile.in
+++ b/contrib/pccts/support/genmk/Makefile.in
@@ -169,7 +169,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/support/rexpr/Makefile.in b/contrib/pccts/support/rexpr/Makefile.in
index 7ca285f..e331fdc 100644
--- a/contrib/pccts/support/rexpr/Makefile.in
+++ b/contrib/pccts/support/rexpr/Makefile.in
@@ -169,7 +169,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/support/set/Makefile.in b/contrib/pccts/support/set/Makefile.in
index aa2a585..d8b1f52 100644
--- a/contrib/pccts/support/set/Makefile.in
+++ b/contrib/pccts/support/set/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/support/sym/Makefile.in b/contrib/pccts/support/sym/Makefile.in
index 26211af..9943a0d 100644
--- a/contrib/pccts/support/sym/Makefile.in
+++ b/contrib/pccts/support/sym/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/pccts/testcpp/Makefile.in b/contrib/pccts/testcpp/Makefile.in
index 63b56b4..02d14e8 100644
--- a/contrib/pccts/testcpp/Makefile.in
+++ b/contrib/pccts/testcpp/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/rtlbrowse/Makefile.am b/contrib/rtlbrowse/Makefile.am
index aaf4452..2b2105a 100644
--- a/contrib/rtlbrowse/Makefile.am
+++ b/contrib/rtlbrowse/Makefile.am
@@ -31,7 +31,7 @@ LDADD= $(GTK_LIBS) $(LIBZ_LDADD) $(LIBBZ2_LDADD) $(LIBLZMA_LDADD) $(AET2_LDADD)
$(LIBJUDY_LDADD) $(GTK_MAC_LIBS) $(GCONF_LIBS)
AM_CFLAGS= -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/helpers \
$(GTK_CFLAGS) $(LIBZ_CFLAGS) $(LIBBZ2_CFLAGS) $(LIBLZMA_CFLAGS) \
- $(LIBFST_CFLAGS) $(AET2_CFLAGS) $(LIBJUDY_CFLAGS) $(INLINE_ASM) \
+ $(LIBFST_CFLAGS) $(AET2_CFLAGS) $(LIBJUDY_CFLAGS) \
$(GTK_MAC_CFLAGS) $(GCONF_CFLAGS)
definehash.c: vpp_keyword.gperf
diff --git a/contrib/rtlbrowse/Makefile.in b/contrib/rtlbrowse/Makefile.in
index f15a44a..a5221cc 100644
--- a/contrib/rtlbrowse/Makefile.in
+++ b/contrib/rtlbrowse/Makefile.in
@@ -234,7 +234,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -360,7 +359,7 @@ LDADD = $(GTK_LIBS) $(LIBZ_LDADD) $(LIBBZ2_LDADD) $(LIBLZMA_LDADD) $(AET2_LDADD)
AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/helpers \
$(GTK_CFLAGS) $(LIBZ_CFLAGS) $(LIBBZ2_CFLAGS) $(LIBLZMA_CFLAGS) \
- $(LIBFST_CFLAGS) $(AET2_CFLAGS) $(LIBJUDY_CFLAGS) $(INLINE_ASM) \
+ $(LIBFST_CFLAGS) $(AET2_CFLAGS) $(LIBJUDY_CFLAGS) \
$(GTK_MAC_CFLAGS) $(GCONF_CFLAGS)
BUILT_SOURCES = definehash.c
diff --git a/contrib/vermin/Makefile.in b/contrib/vermin/Makefile.in
index 9a867b4..e8aa3f2 100644
--- a/contrib/vermin/Makefile.in
+++ b/contrib/vermin/Makefile.in
@@ -173,7 +173,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/contrib/wlf2vcd/Makefile b/contrib/wlf2vcd/Makefile
deleted file mode 100644
index ab542a0..0000000
--- a/contrib/wlf2vcd/Makefile
+++ /dev/null
@@ -1,419 +0,0 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
-# contrib/wlf2vcd/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
- esac; \
- test $$am__dry = yes; \
- }
-pkgdatadir = $(datadir)/gtkwave
-pkgincludedir = $(includedir)/gtkwave
-pkglibdir = $(libdir)/gtkwave
-pkglibexecdir = $(libexecdir)/gtkwave
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = contrib/wlf2vcd
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_$(V))
-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-am__v_at_1 =
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/bybell/gtkwave/gtkwave-code/gtkwave3/missing aclocal-1.13
-AET2_CFLAGS = -DAET2_ALIASDB_IS_PRESENT -DAET2_IS_PRESENT -I/afs/awd/projects/simarama/releases/latest
-AET2_LDADD = /afs/awd/projects/simarama/releases/latest/libaliasdb.so /afs/awd/projects/simarama/releases/latest/libae2rw.so
-ALLOCA =
-AMTAR = $${TAR-tar}
-AM_DEFAULT_VERBOSITY = 1
-AUTOCONF = ${SHELL} /home/bybell/gtkwave/gtkwave-code/gtkwave3/missing autoconf
-AUTOHEADER = ${SHELL} /home/bybell/gtkwave/gtkwave-code/gtkwave3/missing autoheader
-AUTOMAKE = ${SHELL} /home/bybell/gtkwave/gtkwave-code/gtkwave3/missing automake-1.13
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -DWAVE_USE_STRUCT_PACKING -DFST_WRITER_PARALLEL
-COCOA_GTK_CFLAGS =
-COCOA_GTK_LDADD =
-COCOA_GTK_LDFLAGS =
-CPP = gcc -E
-CPPFLAGS = -DWAVE_USE_GTK2
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = /bin/grep -E
-EXEEXT =
-EXTDEBUG = /pub/fsdb/bin/fsdbdebug
-EXTDEBUG2 = /pub/fsdb/bin/fsdb2vcd
-EXTDEBUG3 = /usr/local/bin/vpd2vcd
-EXTDEBUG4 = /usr/local/bin/wlf2vcd
-EXTLOAD_CFLAGS = -DEXTLOAD_PATH=\"/pub/fsdb/bin/fsdbdebug\" -DEXTLOAD_SUFFIX=\"fsdb\" -DEXTCONV_PATH=\"/pub/fsdb/bin/fsdb2vcd\" -DEXT2CONV_PATH=\"/usr/local/bin/vpd2vcd\" -DEXT2LOAD_SUFFIX=\"vpd\" -DEXT3CONV_PATH=\"/usr/local/bin/wlf2vcd\" -DEXT3LOAD_SUFFIX=\"wlf\"
-FASTTREE_CFLAGS =
-FSDB_CFLAGS = -DFSDB_NSYS_IS_PRESENT -DFSDB_IS_PRESENT -I/pub/FsdbReader
-FSDB_LDADD = /pub/FsdbReader/libnsys.so /pub/FsdbReader/libnffr.so
-GCONF_CFLAGS = -DWAVE_HAVE_GCONF -DORBIT2=1 -pthread -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-GCONF_LIBS = -lgconf-2 -lglib-2.0
-GEDITTEST = /usr/bin/gedit
-GEDIT_CFLAGS = -DGEDIT_PATH=\"/usr/bin/gedit\"
-GPERF = /usr/bin/gperf
-GREP = /bin/grep
-GTK_CFLAGS = -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-GTK_CONFIG =
-GTK_LIBS = -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
-GTK_MAC_CFLAGS =
-GTK_MAC_LIBS =
-GTK_UNIX_PRINT_CFLAGS = -pthread -I/usr/include/gtk-unix-print-2.0 -I/usr/include/gtk-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/lib/gtk-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -DWAVE_GTK_UNIX_PRINT
-GTK_UNIX_PRINT_LIBS = -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
-INLINE_ASM = -DUSE_INLINE_ASM
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS =
-LEX = flex
-LEXLIB = -lfl
-LEX_OUTPUT_ROOT = lex.yy
-LIBBZ2_CFLAGS =
-LIBBZ2_DIR =
-LIBBZ2_LDADD = -lbz2
-LIBJUDY_CFLAGS = -D_WAVE_HAVE_JUDY
-LIBJUDY_LDADD = -lJudy
-LIBOBJS =
-LIBS = -lnsl -lpthread -lm -ldl
-LIBXZ_CFLAGS = -D_WAVE_HAVE_XZ
-LIBXZ_LDADD = -llzma
-LIBZ_CFLAGS =
-LIBZ_DIR =
-LIBZ_LDADD = -lz
-LTLIBOBJS =
-MAINT = #
-MAKEINFO = ${SHELL} /home/bybell/gtkwave/gtkwave-code/gtkwave3/missing makeinfo
-MINGW_LDADD =
-MKDIR_P = /bin/mkdir -p
-OBJEXT = o
-PACKAGE = gtkwave
-PACKAGE_BUGREPORT = bybell at rocketmail.com
-PACKAGE_NAME = gtkwave
-PACKAGE_STRING = gtkwave 3.3.53
-PACKAGE_TARNAME = gtkwave
-PACKAGE_URL =
-PACKAGE_VERSION = 3.3.53
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-POW_LIB =
-RANLIB = ranlib
-SET_MAKE =
-SHELL = /bin/sh
-STRIP =
-STRUCT_PACK = -DWAVE_USE_STRUCT_PACKING
-TCL_DEFADD = -DHAVE_LIBTCL
-TCL_INCLUDE_SPEC = -I/usr/include
-TCL_LDADD = -L/usr/lib -ltcl8.5
-TCL_LIB_SPEC = -L/usr/lib -ltcl8.5
-TCL_MAJOR_VERSION = 8
-TCL_MINOR_VERSION = 5
-TK_INCLUDE_SPEC = -I/usr/include
-TK_LDADD = -L/usr/lib -ltk8.5
-TK_LIB_SPEC = -L/usr/lib -ltk8.5
-UPDATE_DESKTOP_DATABASE = /usr/bin/update-desktop-database
-UPDATE_MIME_DATABASE = /usr/bin/update-mime-database
-VERSION = 3.3.53
-XDGDATADIR = ${datadir}
-abs_builddir = /home/bybell/gtkwave/gtkwave-code/gtkwave3/contrib/wlf2vcd
-abs_srcdir = /home/bybell/gtkwave/gtkwave-code/gtkwave3/contrib/wlf2vcd
-abs_top_builddir = /home/bybell/gtkwave/gtkwave-code/gtkwave3
-abs_top_srcdir = /home/bybell/gtkwave/gtkwave-code/gtkwave3
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = $${TAR-tar} chof - "$$tardir"
-am__untar = $${TAR-tar} xf -
-bindir = ${exec_prefix}/bin
-build_alias =
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host_alias =
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/bybell/gtkwave/gtkwave-code/gtkwave3/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(MKDIR_P)
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias =
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-EXTRA_DIST = \
- wlf2vcd.c
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/wlf2vcd/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign contrib/wlf2vcd/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
- ctags-am distclean distclean-generic distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags-am uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/contrib/wlf2vcd/Makefile.in b/contrib/wlf2vcd/Makefile.in
index fd3eb0c..c2d90b8 100644
--- a/contrib/wlf2vcd/Makefile.in
+++ b/contrib/wlf2vcd/Makefile.in
@@ -128,7 +128,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f3aabcf..c7b259a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -159,7 +159,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index a0b92d8..463a3b4 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -159,7 +159,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/man/Makefile.in b/man/Makefile.in
index f6cadff..2c2fc6f 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -161,7 +161,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/Makefile.in b/share/Makefile.in
index a9c7ce5..221513c 100644
--- a/share/Makefile.in
+++ b/share/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/applications/Makefile.in b/share/applications/Makefile.in
index e1f180b..3631723 100644
--- a/share/applications/Makefile.in
+++ b/share/applications/Makefile.in
@@ -158,7 +158,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/icons/Makefile.in b/share/icons/Makefile.in
index e33e707..75c6c29 100644
--- a/share/icons/Makefile.in
+++ b/share/icons/Makefile.in
@@ -218,7 +218,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/icons/gnome/16x16/Makefile.in b/share/icons/gnome/16x16/Makefile.in
index d7c1623..747d4f6 100644
--- a/share/icons/gnome/16x16/Makefile.in
+++ b/share/icons/gnome/16x16/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/icons/gnome/16x16/mimetypes/Makefile.in b/share/icons/gnome/16x16/mimetypes/Makefile.in
index 89d0114..a54c4d7 100644
--- a/share/icons/gnome/16x16/mimetypes/Makefile.in
+++ b/share/icons/gnome/16x16/mimetypes/Makefile.in
@@ -158,7 +158,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/icons/gnome/32x32/Makefile.in b/share/icons/gnome/32x32/Makefile.in
index 3fd1a18..e7243db 100644
--- a/share/icons/gnome/32x32/Makefile.in
+++ b/share/icons/gnome/32x32/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/icons/gnome/32x32/mimetypes/Makefile.in b/share/icons/gnome/32x32/mimetypes/Makefile.in
index 2272602..b7acd70 100644
--- a/share/icons/gnome/32x32/mimetypes/Makefile.in
+++ b/share/icons/gnome/32x32/mimetypes/Makefile.in
@@ -158,7 +158,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/icons/gnome/48x48/Makefile.in b/share/icons/gnome/48x48/Makefile.in
index 00ad668..536a816 100644
--- a/share/icons/gnome/48x48/Makefile.in
+++ b/share/icons/gnome/48x48/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/icons/gnome/48x48/mimetypes/Makefile.in b/share/icons/gnome/48x48/mimetypes/Makefile.in
index f3574d3..69a37a8 100644
--- a/share/icons/gnome/48x48/mimetypes/Makefile.in
+++ b/share/icons/gnome/48x48/mimetypes/Makefile.in
@@ -158,7 +158,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/icons/gnome/Makefile.in b/share/icons/gnome/Makefile.in
index 7388dc0..3e4cb24 100644
--- a/share/icons/gnome/Makefile.in
+++ b/share/icons/gnome/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/mime/Makefile.in b/share/mime/Makefile.in
index 0036b9d..1a46479 100644
--- a/share/mime/Makefile.in
+++ b/share/mime/Makefile.in
@@ -188,7 +188,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/share/mime/packages/Makefile.in b/share/mime/packages/Makefile.in
index 2626ced..a0d219f 100644
--- a/share/mime/packages/Makefile.in
+++ b/share/mime/packages/Makefile.in
@@ -158,7 +158,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/Makefile.am b/src/Makefile.am
index f7c0af4..9b4d391 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ bin_PROGRAMS= gtkwave twinwave
AM_CFLAGS= -I$(srcdir)/.. -I$(srcdir)/helpers $(FASTTREE_CFLAGS) $(GTK_CFLAGS) $(LIBLZMA_CFLAGS) \
$(LIBZ_CFLAGS) $(LIBBZ2_CFLAGS) $(LIBFST_CFLAGS) $(AET2_CFLAGS) $(FSDB_CFLAGS) $(TCL_INCLUDE_SPEC) \
- $(TCL_DEFADD) $(TK_INCLUDE_SPEC) $(EXTLOAD_CFLAGS) $(GEDIT_CFLAGS) $(LIBJUDY_CFLAGS) $(INLINE_ASM) \
+ $(TCL_DEFADD) $(TK_INCLUDE_SPEC) $(EXTLOAD_CFLAGS) $(GEDIT_CFLAGS) $(LIBJUDY_CFLAGS) \
$(GTK_MAC_CFLAGS) $(GCONF_CFLAGS) $(LIBCOCOA_CFLAGS) $(GTK_UNIX_PRINT_CFLAGS)
AM_CXXFLAGS= $(AM_CFLAGS)
diff --git a/src/Makefile.in b/src/Makefile.in
index 85809ab..054f3cc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -271,7 +271,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -380,7 +379,7 @@ LIBCOCOA_CFLAGS = -I$(srcdir)/cocoa
LIBCOCOA_LDADD = ./cocoa/libgtkwmacintegration.a $(COCOA_GTK_LDADD)
AM_CFLAGS = -I$(srcdir)/.. -I$(srcdir)/helpers $(FASTTREE_CFLAGS) $(GTK_CFLAGS) $(LIBLZMA_CFLAGS) \
$(LIBZ_CFLAGS) $(LIBBZ2_CFLAGS) $(LIBFST_CFLAGS) $(AET2_CFLAGS) $(FSDB_CFLAGS) $(TCL_INCLUDE_SPEC) \
- $(TCL_DEFADD) $(TK_INCLUDE_SPEC) $(EXTLOAD_CFLAGS) $(GEDIT_CFLAGS) $(LIBJUDY_CFLAGS) $(INLINE_ASM) \
+ $(TCL_DEFADD) $(TK_INCLUDE_SPEC) $(EXTLOAD_CFLAGS) $(GEDIT_CFLAGS) $(LIBJUDY_CFLAGS) \
$(GTK_MAC_CFLAGS) $(GCONF_CFLAGS) $(LIBCOCOA_CFLAGS) $(GTK_UNIX_PRINT_CFLAGS)
AM_CXXFLAGS = $(AM_CFLAGS)
diff --git a/src/cocoa/Makefile.in b/src/cocoa/Makefile.in
index 1afd04a..58969f8 100644
--- a/src/cocoa/Makefile.in
+++ b/src/cocoa/Makefile.in
@@ -181,7 +181,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
index a8b273c..c3a5998 100644
--- a/src/helpers/Makefile.am
+++ b/src/helpers/Makefile.am
@@ -6,7 +6,7 @@ AIXFLAGS = -bmaxdata:0xd0000000/dsa
LIBLZMA_CFLAGS = -I$(srcdir)/../liblzma $(LIBXZ_CFLAGS)
LIBLZMA_LDADD = $(LIBXZ_LDADD)
-AM_CFLAGS= -I$(srcdir)/.. -I$(srcdir)/../.. $(LIBZ_CFLAGS) $(LIBBZ2_CFLAGS) $(LIBLZMA_CFLAGS) $(LIBJUDY_CFLAGS) $(INLINE_ASM) $(EXTLOAD_CFLAGS) -I$(srcdir)/fst -I$(srcdir)/../../contrib/rtlbrowse
+AM_CFLAGS= -I$(srcdir)/.. -I$(srcdir)/../.. $(LIBZ_CFLAGS) $(LIBBZ2_CFLAGS) $(LIBLZMA_CFLAGS) $(LIBJUDY_CFLAGS) $(EXTLOAD_CFLAGS) -I$(srcdir)/fst -I$(srcdir)/../../contrib/rtlbrowse
bin_PROGRAMS= evcd2vcd fst2vcd vcd2fst fstminer ghwdump lxt2miner lxt2vcd \
shmidcat vcd2lxt vcd2lxt2 vcd2vzt \
diff --git a/src/helpers/Makefile.in b/src/helpers/Makefile.in
index 2b3b776..7b72345 100644
--- a/src/helpers/Makefile.in
+++ b/src/helpers/Makefile.in
@@ -236,7 +236,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -339,7 +338,7 @@ BIGFILES = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
AIXFLAGS = -bmaxdata:0xd0000000/dsa
LIBLZMA_CFLAGS = -I$(srcdir)/../liblzma $(LIBXZ_CFLAGS)
LIBLZMA_LDADD = $(LIBXZ_LDADD)
-AM_CFLAGS = -I$(srcdir)/.. -I$(srcdir)/../.. $(LIBZ_CFLAGS) $(LIBBZ2_CFLAGS) $(LIBLZMA_CFLAGS) $(LIBJUDY_CFLAGS) $(INLINE_ASM) $(EXTLOAD_CFLAGS) -I$(srcdir)/fst -I$(srcdir)/../../contrib/rtlbrowse
+AM_CFLAGS = -I$(srcdir)/.. -I$(srcdir)/../.. $(LIBZ_CFLAGS) $(LIBBZ2_CFLAGS) $(LIBLZMA_CFLAGS) $(LIBJUDY_CFLAGS) $(EXTLOAD_CFLAGS) -I$(srcdir)/fst -I$(srcdir)/../../contrib/rtlbrowse
vcd2fst_SOURCES = vcd2fst.c $(srcdir)/fst/lz4.c $(srcdir)/fst/lz4.h $(srcdir)/fst/fastlz.c $(srcdir)/fst/fastlz.h $(srcdir)/fst/fstapi.c $(srcdir)/fst/fstapi.h $(srcdir)/../../contrib/rtlbrowse/jrb.h $(srcdir)/../../contrib/rtlbrowse/jrb.c
vcd2fst_LDADD = $(LIBZ_LDADD) $(LIBJUDY_LDADD)
fst2vcd_SOURCES = fst2vcd.c $(srcdir)/fst/lz4.c $(srcdir)/fst/lz4.h $(srcdir)/fst/fastlz.c $(srcdir)/fst/fastlz.h $(srcdir)/fst/fstapi.c $(srcdir)/fst/fstapi.h
diff --git a/src/helpers/fst/Makefile.in b/src/helpers/fst/Makefile.in
index 57a8b84..e9e6d9f 100644
--- a/src/helpers/fst/Makefile.in
+++ b/src/helpers/fst/Makefile.in
@@ -175,7 +175,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/helpers/fst/block_format.txt b/src/helpers/fst/block_format.txt
index 5f6f613..0cab3a4 100644
--- a/src/helpers/fst/block_format.txt
+++ b/src/helpers/fst/block_format.txt
@@ -55,6 +55,13 @@ uint64_t section length
uint64_t length of uncompressed hier data
[lz4 compressed data]
+uint8_t FST_BL_HIER_LZ4DUO
+uint64_t section length
+uint64_t length of uncompressed hier data
+varint length of hier data compressed once with lz4
+[lz4 double compressed data]
+
+
===========================================================================
dumpon/off block
diff --git a/src/helpers/fst/fstapi.c b/src/helpers/fst/fstapi.c
index b69fa38..70a8ad4 100644
--- a/src/helpers/fst/fstapi.c
+++ b/src/helpers/fst/fstapi.c
@@ -87,6 +87,7 @@ void **JenkinsIns(void *base_i, const unsigned char *mem, uint32_t length, uint3
#define FST_HDR_FILETYPE_SIZE (1)
#define FST_HDR_TIMEZERO_SIZE (8)
#define FST_GZIO_LEN (32768)
+#define FST_HDR_FOURPACK_DUO_SIZE (4*1024*1024)
#if defined(__i386__) || defined(__x86_64__) || defined(_AIX)
#define FST_DO_MISALIGNED_OPS
@@ -1275,6 +1276,7 @@ for(i=0;i<xc->maxhandle;i++)
}
else
{
+ /* this is extremely conservative: fastlz needs +5% for worst case, lz4 needs siz+(siz/255)+16 */
if(((wrlen * 2) + 2) <= packmemlen)
{
dmem = packmem;
@@ -1713,6 +1715,7 @@ if(xc && !xc->already_in_close && !xc->already_in_flush)
off_t hl, eos;
gzFile zhandle;
int zfd;
+ int fourpack_duo = 0;
#ifndef __MINGW32__
char *fnam = malloc(strlen(xc->filename) + 5 + 1);
#endif
@@ -1759,8 +1762,29 @@ if(xc && !xc->already_in_close && !xc->already_in_flush)
mem = malloc(lz4_maxlen);
hmem = fstMmap(NULL, xc->hier_file_len, PROT_READ|PROT_WRITE, MAP_SHARED, fileno(xc->hier_handle), 0);
packed_len = LZ4_compress((char *)hmem, (char *)mem, xc->hier_file_len);
- fstFwrite(mem, packed_len, 1, xc->handle);
fstMunmap(hmem, xc->hier_file_len);
+
+ fourpack_duo = (!xc->repack_on_close) && (xc->hier_file_len > FST_HDR_FOURPACK_DUO_SIZE); /* double pack when hierarchy is large */
+
+ if(fourpack_duo) /* double packing with LZ4 is faster than gzip */
+ {
+ unsigned char *mem_duo;
+ int lz4_maxlen_duo;
+ int packed_len_duo;
+
+ lz4_maxlen_duo = LZ4_compressBound(packed_len);
+ mem_duo = malloc(lz4_maxlen_duo);
+ packed_len_duo = LZ4_compress((char *)mem, (char *)mem_duo, packed_len);
+
+ fstWriterVarint(xc->handle, packed_len); /* 1st round compressed length */
+ fstFwrite(mem_duo, packed_len_duo, 1, xc->handle);
+ free(mem_duo);
+ }
+ else
+ {
+ fstFwrite(mem, packed_len, 1, xc->handle);
+ }
+
free(mem);
}
@@ -1771,7 +1795,9 @@ if(xc && !xc->already_in_close && !xc->already_in_flush)
fflush(xc->handle);
fstWriterFseeko(xc, xc->handle, fixup_offs, SEEK_SET);
- fputc(xc->fourpack ? FST_BL_HIER_LZ4 : FST_BL_HIER, xc->handle); /* actual tag now also == compression type */
+ fputc(xc->fourpack ?
+ ( fourpack_duo ? FST_BL_HIER_LZ4DUO : FST_BL_HIER_LZ4) :
+ FST_BL_HIER, xc->handle); /* actual tag now also == compression type */
fstWriterFseeko(xc, xc->handle, 0, SEEK_END); /* move file pointer to end for any section adds */
fflush(xc->handle);
@@ -2156,8 +2182,8 @@ void fstWriterSetPackType(void *ctx, enum fstWriterPackType typ)
struct fstWriterContext *xc = (struct fstWriterContext *)ctx;
if(xc)
{
- xc->fastpack = (typ != FST_WR_PT_ZLIB);
- xc->fourpack = (typ == FST_WR_PT_LZ4);
+ xc->fastpack = (typ != FST_WR_PT_ZLIB);
+ xc->fourpack = (typ == FST_WR_PT_LZ4);
}
}
@@ -2747,9 +2773,10 @@ unsigned use_vcd_extensions : 1;
unsigned double_endian_match : 1;
unsigned native_doubles_for_cb : 1;
unsigned contains_geom_section : 1;
-unsigned contains_hier_section : 1; /* valid for hier_pos */
-unsigned contains_hier_section_lz4 : 1; /* valid for hier_pos */
-unsigned limit_range_valid : 1; /* valid for limit_range_start, limit_range_end */
+unsigned contains_hier_section : 1; /* valid for hier_pos */
+unsigned contains_hier_section_lz4duo : 1; /* valid for hier_pos (contains_hier_section_lz4 always also set) */
+unsigned contains_hier_section_lz4 : 1; /* valid for hier_pos */
+unsigned limit_range_valid : 1; /* valid for limit_range_start, limit_range_end */
char version[FST_HDR_SIM_VERSION_SIZE + 1];
char date[FST_HDR_DATE_SIZE + 1];
@@ -3292,7 +3319,7 @@ if(!xc->fh)
else
if(xc->contains_hier_section_lz4 && !xc->contains_hier_section)
{
- htyp = FST_BL_HIER_LZ4;
+ htyp = xc->contains_hier_section_lz4duo ? FST_BL_HIER_LZ4DUO : FST_BL_HIER_LZ4;
}
sprintf(fnam, "%s.hier_%d_%p", xc->filename, getpid(), (void *)xc);
@@ -3317,7 +3344,7 @@ if(!xc->fh)
}
}
else
- if(htyp == FST_BL_HIER_LZ4)
+ if((htyp == FST_BL_HIER_LZ4) || (htyp == FST_BL_HIER_LZ4DUO))
{
fstReaderFseeko(xc, xc->f, xc->hier_pos - 8, SEEK_SET); /* get section len */
clen = fstReaderUint64(xc->f) - 16;
@@ -3367,6 +3394,34 @@ if(!xc->fh)
gzclose(zhandle);
}
else
+ if(htyp == FST_BL_HIER_LZ4DUO)
+ {
+ unsigned char *lz4_cmem = malloc(clen);
+ unsigned char *lz4_ucmem = malloc(uclen);
+ unsigned char *lz4_ucmem2;
+ uint64_t uclen2;
+ int skiplen2 = 0;
+
+ fstFread(lz4_cmem, clen, 1, xc->f);
+
+ uclen2 = fstGetVarint64(lz4_cmem, &skiplen2);
+ lz4_ucmem2 = malloc(uclen2);
+ pass_status = (uclen2 == LZ4_decompress_safe_partial ((char *)lz4_cmem + skiplen2, (char *)lz4_ucmem2, clen - skiplen2, uclen2, uclen2));
+ if(pass_status)
+ {
+ pass_status = (uclen == LZ4_decompress_safe_partial ((char *)lz4_ucmem2, (char *)lz4_ucmem, uclen2, uclen, uclen));
+
+ if(fstFwrite(lz4_ucmem, uclen, 1, xc->fh) != 1)
+ {
+ pass_status = 0;
+ }
+ }
+
+ free(lz4_ucmem2);
+ free(lz4_ucmem);
+ free(lz4_cmem);
+ }
+ else
if(htyp == FST_BL_HIER_LZ4)
{
unsigned char *lz4_cmem = malloc(clen);
@@ -4119,6 +4174,12 @@ if(gzread_pass_status)
xc->contains_hier_section = 1;
xc->hier_pos = ftello(xc->f);
}
+ else if(sectype == FST_BL_HIER_LZ4DUO)
+ {
+ xc->contains_hier_section_lz4 = 1;
+ xc->contains_hier_section_lz4duo = 1;
+ xc->hier_pos = ftello(xc->f);
+ }
else if(sectype == FST_BL_HIER_LZ4)
{
xc->contains_hier_section_lz4 = 1;
diff --git a/src/helpers/fst/fstapi.h b/src/helpers/fst/fstapi.h
index 7e07034..5a56684 100644
--- a/src/helpers/fst/fstapi.h
+++ b/src/helpers/fst/fstapi.h
@@ -64,6 +64,7 @@ enum fstBlockType {
FST_BL_HIER = 4,
FST_BL_VCDATA_DYN_ALIAS = 5,
FST_BL_HIER_LZ4 = 6,
+ FST_BL_HIER_LZ4DUO = 7,
FST_BL_ZWRAPPER = 254, /* indicates that whole trace is gz wrapped */
FST_BL_SKIP = 255 /* used while block is being written */
diff --git a/src/helpers/fst/lz4.c b/src/helpers/fst/lz4.c
index 0f2c574..fe67c76 100644
--- a/src/helpers/fst/lz4.c
+++ b/src/helpers/fst/lz4.c
@@ -469,7 +469,7 @@ FORCE_INLINE int LZ4_compress_generic(
// Encode Literal length
length = (int)(ip - anchor);
token = op++;
- if ((limitedOutput) && unlikely(op + length + (2 + 1 + LASTLITERALS) + (length>>8) > oend)) return 0; // Check output limit
+ if ((limitedOutput) && unlikely(op + length + (2 + 1 + LASTLITERALS) + (length/255) > oend)) return 0; // Check output limit
if (length>=(int)RUN_MASK)
{
int len = length-RUN_MASK;
@@ -534,7 +534,7 @@ _last_literals:
// Encode Last Literals
{
int lastRun = (int)(iend - anchor);
- if ((limitedOutput) && (((char*)op - dest) + lastRun + 1 + ((lastRun+255-RUN_MASK)/255) > (U32)maxOutputSize)) return 0; // Check output limit
+ if ((limitedOutput) && (((char*)op - dest) + lastRun + 1 + ((lastRun+255-RUN_MASK)/255) > (U32)maxOutputSize)) return 0; // Check output limit
if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK<<ML_BITS); lastRun-=RUN_MASK; for(; lastRun >= 255 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; }
else *op++ = (BYTE)(lastRun<<ML_BITS);
memcpy(op, anchor, iend - anchor);
@@ -648,10 +648,10 @@ char* LZ4_slideInputBuffer (void* LZ4_Data)
}
else
{
- memcpy((void*)(lz4ds->bufferStart), (const void*)(lz4ds->nextBlock - 64 KB), 64 KB);
- lz4ds->nextBlock -= delta;
- lz4ds->base -= delta;
- }
+ memcpy((void*)(lz4ds->bufferStart), (const void*)(lz4ds->nextBlock - 64 KB), 64 KB);
+ lz4ds->nextBlock -= delta;
+ lz4ds->base -= delta;
+ }
return (char*)(lz4ds->nextBlock);
}
diff --git a/src/helpers/lxt2_read.c b/src/helpers/lxt2_read.c
index 3cfec53..88a6730 100644
--- a/src/helpers/lxt2_read.c
+++ b/src/helpers/lxt2_read.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003-2012 Tony Bybell.
+ * Copyright (c) 2003-2014 Tony Bybell.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -23,12 +23,6 @@
#include <config.h>
#include "lxt2_read.h"
-#if defined(USE_INLINE_ASM)
-#if defined(__i386__) || defined(__x86_64__)
-#define USE_X86_INLINE_ASM
-#endif
-#endif
-
/****************************************************************************/
#ifdef _WAVE_BE32
@@ -52,44 +46,6 @@
/*
* reconstruct 8/16/24/32 bits out of the lxt's representation
- * of a big-endian integer. x86 specific version...
- */
-
-#ifdef USE_X86_INLINE_ASM
-
-#define lxt2_rd_get_byte(mm,offset) ((unsigned int)(*((unsigned char *)(mm)+(offset))))
-
-_LXT2_RD_INLINE static unsigned int lxt2_rd_get_16(void *mm, int offset)
-{
-unsigned short x = *((unsigned short *)((unsigned char *)mm+offset));
-
-#if defined(__x86_64__)
- __asm("xchgb %b0,%h0" : "=Q" (x) : "0" (x));
-#else
- __asm("xchgb %b0,%h0" : "=q" (x) : "0" (x));
-#endif
-
- return (unsigned int) x;
-}
-
-_LXT2_RD_INLINE static unsigned int lxt2_rd_get_32(void *mm, int offset) /* note that bswap is really 486+ */
-{
-unsigned int x = *((unsigned int *)((unsigned char *)mm+offset));
-
- __asm("bswap %0":
- "=r" (x) :
- "0" (x));
-
- return x;
-}
-
-#define lxt2_rd_get_24(mm,offset) ((lxt2_rd_get_32((mm),(offset)-1)<<8)>>8)
-#define lxt2_rd_get_64(mm,offset) ((((lxtint64_t)lxt2_rd_get_32((mm),(offset)))<<32)|((lxtint64_t)lxt2_rd_get_32((mm),(offset)+4)))
-
-#else
-
-/*
- * reconstruct 8/16/24/32 bits out of the lxt's representation
* of a big-endian integer. this should work on all architectures.
*/
#define lxt2_rd_get_byte(mm,offset) ((unsigned int)(*((unsigned char *)(mm)+(offset))))
@@ -130,7 +86,6 @@ return(
}
#endif
-#endif
/****************************************************************************/
diff --git a/src/helpers/v2l_debug.h b/src/helpers/v2l_debug.h
index f028c83..1b24a48 100644
--- a/src/helpers/v2l_debug.h
+++ b/src/helpers/v2l_debug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Tony Bybell.
+ * Copyright (c) 2001-2014 Tony Bybell.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -54,7 +54,11 @@ typedef guint64 UTimeType;
#define LLDescriptor(x) x##LL
#define ULLDescriptor(x) x##ULL
#ifndef __MINGW32__
+#if __WORDSIZE == 64
+#define TTFormat "%ld"
+#else
#define TTFormat "%lld"
+#endif
#else
#define TTFormat "%I64d"
#endif
diff --git a/src/helpers/v2l_debug_lxt2.h b/src/helpers/v2l_debug_lxt2.h
index aff0525..f33c69d 100644
--- a/src/helpers/v2l_debug_lxt2.h
+++ b/src/helpers/v2l_debug_lxt2.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001 Tony Bybell.
+ * Copyright (c) 2001-2014 Tony Bybell.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -55,7 +55,11 @@ typedef guint64 UTimeType;
#define LLDescriptor(x) x##LL
#define ULLDescriptor(x) x##ULL
#ifndef __MINGW32__
+#if __WORDSIZE == 64
+#define TTFormat "%ld"
+#else
#define TTFormat "%lld"
+#endif
#else
#define TTFormat "%I64d"
#endif
diff --git a/src/helpers/vzt_read.c b/src/helpers/vzt_read.c
index f775caf..d2ca6e6 100644
--- a/src/helpers/vzt_read.c
+++ b/src/helpers/vzt_read.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003-2012 Tony Bybell.
+ * Copyright (c) 2003-2014 Tony Bybell.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -36,12 +36,6 @@
#include <fcntl.h>
#endif
-#if defined(USE_INLINE_ASM)
-#if defined(__i386__) || defined(__x86_64__)
-#define USE_X86_INLINE_ASM
-#endif
-#endif
-
/****************************************************************************/
static int is_big_endian(void)
@@ -134,43 +128,6 @@ if(lt->pthreads)
/*
* reconstruct 8/16/24/32 bits out of the vzt's representation
- * of a big-endian integer. x86 specific version...
- */
-
-#ifdef USE_X86_INLINE_ASM
-
-#define vzt_rd_get_byte(mm,offset) ((unsigned int)(*((unsigned char *)(mm)+(offset))))
-
-_VZT_RD_INLINE static unsigned int vzt_rd_get_16(void *mm, int offset)
-{
-unsigned short x = *((unsigned short *)((unsigned char *)mm+offset));
-
-#if defined(__x86_64__)
- __asm("xchgb %b0,%h0" : "=Q" (x) : "0" (x));
-#else
- __asm("xchgb %b0,%h0" : "=q" (x) : "0" (x));
-#endif
-
- return (unsigned int) x;
-}
-
-_VZT_RD_INLINE static unsigned int vzt_rd_get_32(void *mm, int offset) /* note that bswap is really 486+ */
-{
-unsigned int x = *((unsigned int *)((unsigned char *)mm+offset));
-
- __asm("bswap %0":
- "=r" (x) :
- "0" (x));
-
- return x;
-}
-
-#define vzt_rd_get_64(mm,offset) ((((vztint64_t)vzt_rd_get_32((mm),(offset)))<<32)|((vztint64_t)vzt_rd_get_32((mm),(offset)+4)))
-
-#else
-
-/*
- * reconstruct 8/16/24/32 bits out of the vzt's representation
* of a big-endian integer. this should work on all architectures.
*/
#define vzt_rd_get_byte(mm,offset) ((unsigned int)(*((unsigned char *)(mm)+(offset))))
@@ -202,7 +159,6 @@ return(
}
#endif
-#endif
static unsigned int vzt_rd_get_32r(void *mm, int offset)
{
diff --git a/src/libbz2/Makefile.in b/src/libbz2/Makefile.in
index 9d4d1b8..ae06281 100644
--- a/src/libbz2/Makefile.in
+++ b/src/libbz2/Makefile.in
@@ -177,7 +177,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/liblzma/Makefile.in b/src/liblzma/Makefile.in
index 2a8a99a..ec1cae3 100644
--- a/src/liblzma/Makefile.in
+++ b/src/liblzma/Makefile.in
@@ -175,7 +175,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/libz/Makefile.in b/src/libz/Makefile.in
index a8fde49..907d817 100644
--- a/src/libz/Makefile.in
+++ b/src/libz/Makefile.in
@@ -180,7 +180,6 @@ GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
GTK_MAC_LIBS = @GTK_MAC_LIBS@
GTK_UNIX_PRINT_CFLAGS = @GTK_UNIX_PRINT_CFLAGS@
GTK_UNIX_PRINT_LIBS = @GTK_UNIX_PRINT_LIBS@
-INLINE_ASM = @INLINE_ASM@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/src/lxt.c b/src/lxt.c
index 2a4d9ec..96cf9ba 100644
--- a/src/lxt.c
+++ b/src/lxt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) Tony Bybell 2001-2013.
+ * Copyright (c) Tony Bybell 2001-2014.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -33,13 +33,6 @@
#include "debug.h"
#include "hierpack.h"
-#if defined(USE_INLINE_ASM)
-#if defined(__i386__) || defined(__x86_64__)
-#define USE_X86_INLINE_ASM
-#endif
-#endif
-
-
/****************************************************************************/
/*
@@ -178,53 +171,13 @@ inline static unsigned int get_64(offset) {
/*
* reconstruct 8/16/24/32 bits out of the lxt's representation
- * of a big-endian integer. x86 specific version...
- */
-
-#ifdef USE_X86_INLINE_ASM
-
-inline static unsigned int get_byte(off_t offset) {
- return ((unsigned int)(*((unsigned char *) GLOBALS->mm_lxt_c_1+offset)));
-}
-
-inline static unsigned int get_16(off_t offset)
-{
-unsigned short x = *((unsigned short *)((unsigned char *)GLOBALS->mm_lxt_c_1+offset));
-
-#if defined(__x86_64__)
- __asm("xchgb %b0,%h0" : "=Q" (x) : "0" (x));
-#else
- __asm("xchgb %b0,%h0" : "=q" (x) : "0" (x));
-#endif
-
- return (unsigned int) x;
-}
-
-inline static unsigned int get_32(off_t offset) /* note that bswap is really 486+ */
-{
-unsigned int x = *((unsigned int *)((unsigned char *)GLOBALS->mm_lxt_c_1+offset));
-
- __asm("bswap %0":
- "=r" (x) :
- "0" (x));
-
- return x;
-}
-
-#define get_24(offset) ((get_32((offset)-1)<<8)>>8)
-#define get_64(offset) ((((UTimeType)get_32(offset))<<32)|((UTimeType)get_32((offset)+4)))
-
-#else
-
-/*
- * reconstruct 8/16/24/32 bits out of the lxt's representation
* of a big-endian integer. this should work on all architectures.
*/
#define get_byte(offset) ((unsigned int)(*((unsigned char *)GLOBALS->mm_lxt_c_1+offset)))
static unsigned int get_16(off_t offset)
{
- unsigned char *nn=(unsigned char *)GLOBALS->mm_lxt_c_1+offset;
+unsigned char *nn=(unsigned char *)GLOBALS->mm_lxt_c_1+offset;
unsigned int m1=*((unsigned char *)(nn++));
unsigned int m2=*((unsigned char *)nn);
return((m1<<8)|m2);
@@ -258,7 +211,6 @@ return(
}
#endif
-#endif
/****************************************************************************/
diff --git a/src/treesearch_gtk2.c b/src/treesearch_gtk2.c
index f706e0b..8f067e5 100644
--- a/src/treesearch_gtk2.c
+++ b/src/treesearch_gtk2.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) Tristan Gingold and Tony Bybell 2006-2012.
+ * Copyright (c) Tristan Gingold and Tony Bybell 2006-2014.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -202,10 +202,12 @@ fill_sig_store (void)
}
}
+ wrexm = 0;
if (
(GLOBALS->filter_str_treesearch_gtk2_c_1 == NULL) ||
((!GLOBALS->filter_noregex_treesearch_gtk2_c_1) && (wrexm = wave_regex_match(t->name, WAVE_REGEX_TREE)) && (!GLOBALS->filter_matlen_treesearch_gtk2_c_1)) ||
- (GLOBALS->filter_matlen_treesearch_gtk2_c_1 && (GLOBALS->filter_typ_treesearch_gtk2_c_1 == vardir) && wrexm)
+ (GLOBALS->filter_matlen_treesearch_gtk2_c_1 && (GLOBALS->filter_typ_treesearch_gtk2_c_1 == vardir) &&
+ (wrexm || (wrexm = wave_regex_match(t->name, WAVE_REGEX_TREE))) )
)
{
gtk_list_store_prepend (GLOBALS->sig_store_treesearch_gtk2_c_1, &iter);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gtkwave.git
More information about the Pkg-electronics-commits
mailing list