Packman Build Service PMBS

handbrake.changes Changed

handbrake.spec Changed

@@ -14,9 +14,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 Name:           handbrake
-#define rev 3549
-#Version:			0.9.4+r%{rev}
-Version:        0.9.8
+Version:        0.9.9
 Release:        1.pm.1
 License:        GPL-2.0+
 Summary:        Multithreaded Video Transcoder
@@ -27,32 +25,21 @@
 Source:         http://prdownloads.sourceforge.net/handbrake/HandBrake-%{version}.tar.bz2
 Source101:      http://download.handbrake.fr/handbrake/contrib/a52dec-0.7.4.tar.gz
 Source102:      http://download.handbrake.fr/handbrake/contrib/faac-1.28.tar.gz
-Source103:      http://download.handbrake.fr/handbrake/contrib/faad2-2.7.tar.gz
-Source104:      http://download.handbrake.fr/handbrake/contrib/ffmpeg-v0.7-1696-gcae4f4b.tar.bz2
-Source105:      http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
-Source106:      http://download.handbrake.fr/handbrake/contrib/libdca-r81-strapped.tar.gz
-Source107:      http://download.handbrake.fr/handbrake/contrib/libdvdnav-svn1168.tar.gz
-Source108:      http://download.handbrake.fr/handbrake/contrib/libdvdread-svn1168.tar.gz
+#Source103:      http://download.handbrake.fr/handbrake/contrib/faad2-2.7.tar.gz
+Source104:      http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2
+Source105:      http://download.handbrake.fr/handbrake/contrib/yasm-1.2.0.tar.gz
+Source106:      http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
+Source107:      http://download.handbrake.fr/handbrake/contrib/libdvdread-svn1168.tar.gz
+Source108:      http://download.handbrake.fr/handbrake/contrib/libdvdnav-svn1168.tar.gz
 Source109:      http://download.handbrake.fr/handbrake/contrib/libmkv-0.6.5-0-g82075ae.tar.gz
-Source110:      http://download.handbrake.fr/handbrake/contrib/libogg-1.3.0.tar.gz
-Source111:      http://download.handbrake.fr/handbrake/contrib/libsamplerate-0.1.4.tar.gz
-Source112:      http://download.handbrake.fr/handbrake/contrib/libtheora-1.1.0.tar.bz2
-Source113:      http://download.handbrake.fr/handbrake/contrib/libvorbis-aotuv_b6.03.tar.bz2
-Source114:      http://download.handbrake.fr/handbrake/contrib/mp4v2-trunk-r355.tar.bz2
-Source115:      http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
-Source116:      http://download.handbrake.fr/handbrake/contrib/x264-r2146-bcd41db.tar.gz
-Source117:      http://download.m0k.org/handbrake/contrib/fontconfig-2.8.0.tar.gz
-Source118:      http://download.handbrake.fr/handbrake/contrib/freetype-2.4.7.tar.bz2
-Source119:      http://download.handbrake.fr/handbrake/contrib/libass-0.10.0-1.tar.gz
-Source120:      http://download.handbrake.fr/handbrake/contrib/libbluray-0.0.1-pre-213-ga869da8.tar.gz
-Source121:      http://download.m0k.org/handbrake/contrib/libxml2-2.7.7.tar.gz
-Source122:      http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.2.tar.gz
-Source123:      http://download.handbrake.fr/handbrake/contrib/yasm-1.1.0.tar.gz
+Source110:      http://download.handbrake.fr/handbrake/contrib/mp4v2-trunk-r355.tar.bz2
+Source111:      http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
+Source112:      http://download.handbrake.fr/handbrake/contrib/x264-r2273-b3065e6.tar.gz
+Source113:      http://download.handbrake.fr/handbrake/contrib/libbluray-0.2.3.tar.bz2
+#Source120:      http://download.handbrake.fr/handbrake/contrib/libdca-r81-strapped.tar.gz
 Source151:      handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch
 Source152:      handbrake-libmkv_no_return_in_nonvoid_function.patch
 Source99:       handbrake-rpmlintrc
-Patch0:         handbrake-harfbuzz.patch
-Patch1:         handbrake-CLI_libs.patch
 BuildRequires:  alsa-devel
 BuildRequires:  curl
 BuildRequires:  fribidi-devel
@@ -92,9 +79,9 @@
 BuildRequires:  intltool
 BuildRequires:  libtool
 BuildRequires:  make
-BuildRequires:  nasm
 BuildRequires:  update-desktop-files
-BuildRequires:  yasm
+BuildRequires:  fontconfig-devel freetype2-devel libxml2-devel libass-devel
+BuildRequires:  libogg-devel libvorbis-devel libtheora-devel libsamplerate-devel
 
 %description
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
@@ -129,16 +116,22 @@
 %setup -q -n "HandBrake-%{version}"
 %endif
 
-%patch0 -p1
-%patch1 -p0
+# unstable, so patch from 0.9.8 did not apply, use the script
+# used to generate the patch instead
+mv -i libhb/hb.h libhb/handbrake.h
+mv -i gtk/src/hb-backend.h gtk/src/handbrake-backend.h
+find $ -name '*.h' -o -name '*.c' $ -exec \
+    grep -l 'include.*"hb.h\|hb-backend.h"' {} + | \
+    xargs perl -pi -e 's/include\s*"hb.h"/include "handbrake.h"/;
+      s/include\s*"hb-backend.h"/include "handbrake-backend.h"/'
 
 # Copy 3rd party dependencies into expected locations:
 mkdir download
+# 
 for f in \
-%{S:101} %{S:102} %{S:103} %{S:104} %{S:105} %{S:106} \
+%{S:101} %{S:102} %{S:104} %{S:105} %{S:106} \
 %{S:107} %{S:108} %{S:109} %{S:110} %{S:111} %{S:112} \
-%{S:113} %{S:114} %{S:115} %{S:116} %{S:117} %{S:118} \
-%{S:119} %{S:120} %{S:121} %{S:122} %{S:123} \
+%{S:113} \
 ; do
      ln -s "$f" download/
 done
@@ -151,7 +144,10 @@
 | while read url; do
      f=$(echo "$url" | sed 's|^.*/||')
      case $f in
-    	  bzip2*|libiconv*|pthreads*|zlib*) continue ;;
+    	  bzip2*|libiconv*|pthreads*|zlib*|autoconf*|automake*|\
+          fdk-aac*|fontconfig*|freetype*|libass*|libogg*|libsamplerate*|\
+          libtheora*|libtool*|libvorbis*|libxml2*|m4*)
+            continue ;;
      esac
      [ -e "$RPM_SOURCE_DIR/$f" ] || echo "$url">>"$missing"
 done
@@ -163,22 +159,20 @@
 fi
 
 %build
-# will be removed when the makefiles are fixed, currently
-# fails on openSUSE factory because of --as-needed
-# export SUSE_ASNEEDED=0
 export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused"
 export CXXFLAGS="$CFLAGS -Wno-reorder"
+export PATH="%{_builddir}/HandBrake-%{version}/build/contrib/bin:$PATH"
 
-# cp "%{S:151}" contrib/ffmpeg/A99-fix-missing-return-in-nonvoid-function.patch
 cp %{S:152} contrib/libmkv/A99-fix-missing-return-in-nonvoid-function.patch
 
-mkdir build
+mkdir -p build
 ./configure \
      --force \
      --build="$PWD/build" \
      --prefix="%{buildroot}%{_prefix}" \
      --strip="/bin/true" \
      --optimize=speed \
+     --enable-ff-mpeg2 \
      --debug=max
 
 GHB_PKGS="dbus-glib-1 glib-2.0 gdk-pixbuf-2.0 gudev-1.0 webkit-1.0 libnotify"
@@ -189,7 +183,7 @@
 pushd build
 make libhb/project.h
 make %{?_smp_mflags} V=1 \
-    GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb" \
+    GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb -I../../contrib/include" \
     GHB_LIBS="$(pkg-config --libs $GHB_PKGS)"
 popd #build

handbrake-CLI_libs.patch Deleted

handbrake-harfbuzz.patch Deleted

@@ -1,1443 +0,0 @@
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/audiohandler.c HandBrake-0.9.8/gtk/src/audiohandler.c
---- HandBrake-0.9.8.orig/gtk/src/audiohandler.c	2012-05-05 20:13:43.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/audiohandler.c	2013-04-05 20:37:10.000000000 +0200
-@@ -12,9 +12,9 @@
-  */
- 
- #include "ghbcompat.h"
--#include "hb.h"
-+#include "handbrake.h"
- #include "settings.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "values.h"
- #include "callbacks.h"
- #include "preview.h"
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/callbacks.c HandBrake-0.9.8/gtk/src/callbacks.c
---- HandBrake-0.9.8.orig/gtk/src/callbacks.c	2012-06-21 20:31:30.000000000 +0200
-+++ HandBrake-0.9.8/gtk/src/callbacks.c	2013-04-05 20:37:10.000000000 +0200
-@@ -64,7 +64,7 @@
- #include <libappindicator/app-indicator.h>
- #endif
- 
--#include "hb.h"
-+#include "handbrake.h"
- #include "callbacks.h"
- #include "queuehandler.h"
- #include "audiohandler.h"
-@@ -76,7 +76,7 @@
- #include "values.h"
- #include "plist.h"
- #include "appcast.h"
--#include "hb-backend.h"
-+#include "handbrake-backend.h"
- #include "ghb-dvd.h"
- #include "ghbcellrenderertext.h"
- 
-diff -x '*~' -urN HandBrake-0.9.8.orig/gtk/src/handbrake-backend.h HandBrake-0.9.8/gtk/src/handbrake-backend.h
---- HandBrake-0.9.8.orig/gtk/src/handbrake-backend.h	1970-01-01 01:00:00.000000000 +0100
-+++ HandBrake-0.9.8/gtk/src/handbrake-backend.h	2013-04-05 20:56:10.000000000 +0200
-@@ -0,0 +1,184 @@
-+/*
-+ * This program 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 2 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 Library 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
-+ */
-+ 
-+#if !defined(_HBBACKEND_H_)
-+#define _HBBACKEND_H_
-+
-+#include "settings.h"
-+#include "handbrake.h"
-+
-+enum
-+{
-+	GHB_ERROR_NONE,
-+	GHB_ERROR_CANCELED,
-+	GHB_ERROR_FAIL,
-+};
-+
-+typedef struct
-+{
-+	gint state;
-+
-+	// SCANNING
-+	gint title_count;
-+	gint title_cur;
-+
-+	// WORKING
-+	gint unique_id;
-+	gint job_cur;
-+	gint job_count;
-+	gdouble progress;
-+	gdouble rate_cur;
-+	gdouble rate_avg;
-+	gint hours;
-+	gint minutes;
-+	gint seconds;
-+	gint error;
-+} ghb_instance_status_t;
-+
-+typedef struct
-+{
-+	ghb_instance_status_t scan;
-+	ghb_instance_status_t queue;
-+} ghb_status_t;
-+
-+#define GHB_PIC_KEEP_WIDTH          0x01
-+#define GHB_PIC_KEEP_HEIGHT         0x02
-+#define GHB_PIC_KEEP_DISPLAY_WIDTH  0x04
-+#define GHB_PIC_KEEP_DISPLAY_HEIGHT 0x08
-+#define GHB_PIC_KEEP_DAR            0x10
-+#define GHB_PIC_KEEP_PAR            0x20
-+#define GHB_PIC_USE_MAX             0x40
-+
-+typedef struct
-+{
-+	gchar *path;
-+	gchar *name;
-+	gint index;
-+	gint type;
-+	char *video_codec_name;
-+	gint width;
-+	gint height;
-+	gint crop[4];
-+	gint num_chapters;
-+	gint rate;
-+	gint rate_base;
-+	gint interlaced;
-+	gint aspect_n;
-+	gint aspect_d;
-+	gint hours;
-+	gint minutes;
-+	gint seconds;
-+	gint64 duration;
-+	gint angle_count;
-+} ghb_title_info_t;
-+
-+#define GHB_AUDIO_SAMPLERATE 1
-+#define GHB_AUDIO_BITRATE 2
-+#define GHB_FRAMERATE 3
-+
-+const gchar* ghb_version(void);
-+void ghb_vquality_range(
-+	signal_user_data_t *ud, 
-+	gdouble *min, 
-+	gdouble *max,
-+	gdouble *step,
-+	gdouble *page,
-+	gint *digits,
-+	gboolean *inverted);
-+//const gchar* ghb_get_rate_string(gint rate, gint type);
-+void ghb_combo_init(signal_user_data_t *ud);
-+void ghb_backend_init(gint debug);
-+void ghb_backend_close(void);
-+void ghb_add_job(GValue *js, gint unique_id);
-+void ghb_remove_job(gint unique_id);
-+void ghb_start_queue(void);
-+void ghb_stop_queue(void);
-+void ghb_pause_queue(void);
-+
-+void ghb_add_live_job(GValue *js, gint unique_id);
-+void ghb_start_live_encode();
-+void ghb_stop_live_encode();
-+
-+void ghb_clear_scan_state(gint state);
-+void ghb_clear_queue_state(gint state);
-+
-+void ghb_set_state(gint state);
-+gint ghb_get_scan_state();
-+gint ghb_get_queue_state();
-+void ghb_get_status(ghb_status_t *status);
-+void ghb_track_status(void);
-+void ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count, guint64 min_duration);
-+void ghb_backend_scan_stop();
-+void ghb_backend_queue_scan(const gchar *path, gint titleindex);
-+gboolean ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex);
-+void ghb_par_init(signal_user_data_t *ud);
-+void ghb_set_scale(signal_user_data_t *ud, gint mode);
-+void ghb_set_scale_settings(GValue *settings, gint mode);
-+GValue* ghb_get_chapters(gint titleindex);
-+void ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss);
-+void ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss);
-+gint ghb_get_best_mix(hb_audio_config_t *aconfig, gint acodec, gint mix);
-+gboolean ghb_ac3_in_audio_list(const GValue *audio_list);
-+gboolean ghb_audio_is_passthru(gint acodec);
-+gboolean ghb_audio_can_passthru(gint acodec);
-+gint ghb_get_default_acodec(void);
-+hb_audio_config_t* ghb_get_scan_audio_info(gint titleindex, gint audioindex);
-+void ghb_set_bitrate_opts(
-+	GtkBuilder *builder, gint first_rate, gint last_rate, gint extra_rate);
-+void ghb_grey_combo_options(signal_user_data_t *ud);
-+void ghb_update_ui_combo_box(
-+	signal_user_data_t *ud, const gchar *name, gint user_data, gboolean all);
-+gchar* ghb_get_source_audio_lang(gint titleindex, gint track);
-+gint ghb_find_audio_track(
-+	gint titleindex, const gchar *lang, gint acodec, 
-+	gint fallback_acodec, GHashTable *track_indices);
-+const gchar* ghb_audio_track_description(gint track, int titleindex);
-+void ghb_add_all_subtitles(signal_user_data_t *ud, gint titleindex);
-+gint ghb_find_pref_subtitle_track(const gchar *lang);
-+gint ghb_find_subtitle_track(
-+	gint titleindex, const gchar *lang, gboolean burn, 
-+	gboolean force, gint source, GHashTable *track_indices);
-+gint ghb_pick_subtitle_track(signal_user_data_t *ud);
-+gint ghb_find_cc_track(gint titleindex);
-+gint ghb_longest_title(void);
-+gchar* ghb_build_advanced_opts_string(GValue *settings);
-+GdkPixbuf* ghb_get_preview_image(
-+	gint titleindex, gint index, signal_user_data_t *ud,

HandBrake-0.9.8.tar.bz2 -> HandBrake-0.9.9.tar.bz2 Changed

fontconfig-2.8.0.tar.gz Deleted

freetype-2.4.7.tar.bz2 Deleted

handbrake.ebuild Added

@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 74053 2012-07-18 17:33:26Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Sebastien Piccand <sebcactus gmail com>
+
+pkgname=('handbrake' 'handbrake-cli')
+pkgver=0.9.8
+pkgrel=28
+arch=('i686' 'x86_64')
+url="http://handbrake.fr/"
+license=('GPL')
+makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
+             'gstreamer0.10-base' 'gtk2' 'dbus-glib' 'fribidi')
+source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2)
+
+build() {
+  cd "$srcdir/HandBrake-$pkgver"
+  mv "libhb/hb.h" "libhb/hb2.h"
+  
+  # Fix #include libhb
+  for file in $(grep -R '#include "hb.h"' * 2>/dev/null | awk -F':' '{print $1}'); do sed -i 's/#include\ \"hb\.h\"/#include\ \"hb2\.h\"/g' ${file}; done
+  # Use Python 2
+  sed -i 's/python /python2 /' gtk/src/Makefile.am
+
+  #disable harfbuzz
+  sed -i 's/--disable-png\ --disable-enca\ \\/--disable-png\ --disable-enca\ --disable-harfbuzz\ \\/g' "$srcdir/HandBrake-$pkgver/contrib/libass/module.defs"
+
+  ./configure --prefix=/usr --force --disable-gtk-update-checks
+  cd build
+  make
+}
+
+package_handbrake() {
+  pkgdesc="Multithreaded video transcoder"
+  depends=('bzip2' 'gcc-libs' 'gstreamer0.10-base' 'libnotify' 'dbus-glib'
+           'fribidi' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
+  install=$pkgname.install
+
+  cd "$srcdir/HandBrake-$pkgver/build"
+
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/bin/HandBrakeCLI"
+}
+
+package_handbrake-cli() {
+  pkgdesc="Multithreaded video transcoder (CLI)"
+  depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi')
+
+  cd "$srcdir/HandBrake-$pkgver/build"
+  install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
+}
+
+# vim:set ts=2 sw=2 et:
+sha256sums=('dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798')

libass-0.10.0-1.tar.gz Deleted

libav-v9.6.tar.bz2 Added

libbluray-0.0.1-pre-213-ga869da8.tar.gz/.gitignore Deleted

libbluray-0.0.1-pre-213-ga869da8.tar.gz/TODO.txt Deleted

libbluray-0.0.1-pre-213-ga869da8.tar.gz/doc/README Deleted

libbluray-0.0.1-pre-213-ga869da8.tar.gz/m4/.dummy Deleted

libbluray-0.0.1-pre-213-ga869da8.tar.gz/COPYING -> libbluray-0.2.3.tar.bz2/COPYING Changed

@@ -456,47 +456,3 @@
 DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

libbluray-0.2.3.tar.bz2/ChangeLog Added

libbluray-0.0.1-pre-213-ga869da8.tar.gz/Makefile.am -> libbluray-0.2.3.tar.bz2/Makefile.am Changed

libbluray-0.2.3.tar.bz2/Makefile.in Added

@@ -0,0 +1,902 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
+
+@SET_MAKE@
+
+#   Copyright (c) 2009 Oren Ben-Kiki <oren@ben-kiki.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+#
+#   Automake Support
+#
+#   The following is a template aminclude.am file for use with Automake.
+#   Make targets and variables values are controlled by the various
+#   DX_COND_* conditionals set by autoconf.
+#
+#   The provided targets are:
+#
+#     doxygen-doc: Generate all doxygen documentation.
+#
+#     doxygen-run: Run doxygen, which will generate some of the
+#                  documentation (HTML, CHM, CHI, MAN, RTF, XML)
+#                  but will not do the post processing required
+#                  for the rest of it (PS, PDF, and some MAN).
+#
+#     doxygen-man: Rename some doxygen generated man pages.
+#
+#     doxygen-ps:  Generate doxygen PostScript documentation.
+#
+#     doxygen-pdf: Generate doxygen PDF documentation.
+#
+#   Note that by default these are not integrated into the automake targets.
+#   If doxygen is used to generate man pages, you can achieve this
+#   integration by setting man3_MANS to the list of man pages generated and
+#   then adding the dependency:
+#
+#     $(man3_MANS): doxygen-doc
+#
+#   This will cause make to run doxygen and generate all the documentation.
+#
+#   The following variable is intended for use in Makefile.am:
+#
+#     DX_CLEANFILES = everything to clean.
+#
+#   Then add this variable to MOSTLYCLEANFILES.
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+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 = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/configure $(top_srcdir)/doxygen-include.am \
+	$(top_srcdir)/src/libbluray/bluray-version.h.in COPYING \
+	ChangeLog build-aux/config.guess build-aux/config.sub \
+	build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
+	build-aux/missing
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = src/libbluray/bluray-version.h
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BDJAVA_CFLAGS = @BDJAVA_CFLAGS@
+BLURAY_VERSION_MAJOR = @BLURAY_VERSION_MAJOR@
+BLURAY_VERSION_MICRO = @BLURAY_VERSION_MICRO@
+BLURAY_VERSION_MINOR = @BLURAY_VERSION_MINOR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
+DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DX_CONFIG = @DX_CONFIG@
+DX_DOCDIR = @DX_DOCDIR@
+DX_DOT = @DX_DOT@
+DX_DOXYGEN = @DX_DOXYGEN@
+DX_DVIPS = @DX_DVIPS@
+DX_EGREP = @DX_EGREP@
+DX_ENV = @DX_ENV@
+DX_FLAG_chi = @DX_FLAG_chi@
+DX_FLAG_chm = @DX_FLAG_chm@
+DX_FLAG_doc = @DX_FLAG_doc@
+DX_FLAG_dot = @DX_FLAG_dot@
+DX_FLAG_html = @DX_FLAG_html@
+DX_FLAG_man = @DX_FLAG_man@
+DX_FLAG_pdf = @DX_FLAG_pdf@
+DX_FLAG_ps = @DX_FLAG_ps@
+DX_FLAG_rtf = @DX_FLAG_rtf@
+DX_FLAG_xml = @DX_FLAG_xml@
+DX_HHC = @DX_HHC@

libbluray-0.2.3.tar.bz2/aclocal.m4 Added

@@ -0,0 +1,1009 @@
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
+# This file 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.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
+#
+# This file 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.
+
+# serial 1
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.3], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 1
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 12
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.

libbluray-0.2.3.tar.bz2/build-aux Added

libbluray-0.2.3.tar.bz2/build-aux/config.guess Added

@@ -0,0 +1,1530 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# 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 2 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, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:

libbluray-0.2.3.tar.bz2/build-aux/config.sub Added

@@ -0,0 +1,1773 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# 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 2 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, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)

libbluray-0.2.3.tar.bz2/build-aux/depcomp Added

@@ -0,0 +1,688 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2011-12-04.11; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
+
+# This program 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 2, 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, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.$[^.]*$$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$[^.]*$$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files

libbluray-0.2.3.tar.bz2/build-aux/install-sh Added

@@ -0,0 +1,527 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2011-01-19.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+

libbluray-0.2.3.tar.bz2/build-aux/ltmain.sh Added

@@ -0,0 +1,9661 @@
+
+# libtool (GNU libtool) 2.4.2
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
+#
+# MODE must be one of the following:
+#
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
+TIMESTAMP=""
+package_revision=1.3337
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# NLS nuisances: We save the old values to restore during execute mode.
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+$lt_unset CDPATH
+
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+
+
+: ${CP="cp -f"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`

libbluray-0.2.3.tar.bz2/build-aux/missing Added

@@ -0,0 +1,331 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2012-01-06.13; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program 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 2, 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, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p'
+sed_minuso='s/.* -o $[^ ]*$.*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te*)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file

libbluray-0.2.3.tar.bz2/config.h.in Added

@@ -0,0 +1,134 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `dlopen' function. */
+#undef HAVE_DLOPEN
+
+/* Define to 1 if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <jni.h> header file. */
+#undef HAVE_JNI_H
+
+/* Define to 1 if you have the <libgen.h> header file. */
+#undef HAVE_LIBGEN_H
+
+/* Define to 1 if libxml2 is to be used for metadata parsing */
+#undef HAVE_LIBXML2
+
+/* Define to 1 if you have the <linux/cdrom.h> header file. */
+#undef HAVE_LINUX_CDROM_H
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <mntent.h> header file. */
+#undef HAVE_MNTENT_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if `d_type' is a member of `struct dirent'. */
+#undef HAVE_STRUCT_DIRENT_D_TYPE
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* "Defines the architecture of the java vm." */
+#undef JAVA_ARCH
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* "Define to 1 if using BD-Java" */
+#undef USING_BDJAVA
+
+/* Version number of package */
+#undef VERSION
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to '0x0500' for Windows XP APIs. */
+#undef _WIN32_WINNT

libbluray-0.2.3.tar.bz2/configure Added

@@ -0,0 +1,17055 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.68 for libbluray 0.2.3.
+#
+# Report bugs to <http://www.videolan.org/developers/libbluray.html>.
+#
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\$.*\$"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+      esac;
+      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.

libbluray-0.0.1-pre-213-ga869da8.tar.gz/configure.ac -> libbluray-0.2.3.tar.bz2/configure.ac Changed

@@ -1,9 +1,27 @@
+# library version number
+m4_define([bluray_major], 0)
+m4_define([bluray_minor], 2)
+m4_define([bluray_micro], 3)
+m4_define([bluray_version],[bluray_major.bluray_minor.bluray_micro])
+
+# shared library version (.so version)
+#
+# - If there are no interface changes, increase revision.
+# - If interfaces have been added, increase current and age. Set revision to 0.
+# - If interfaces have been changed or removed, increase current and set age and revision to 0.
+#
+# Library file name will be libbluray.so.(current-age).age.revision
+#
+m4_define([lt_current],  3)
+m4_define([lt_revision], 0)
+m4_define([lt_age],      2)
+
 # initilization
-AC_INIT([libbluray],[0.2], [http://bd.videolan.org/])
+AC_INIT([libbluray], bluray_version, [http://www.videolan.org/developers/libbluray.html])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign tar-ustar])
 AM_CONFIG_HEADER(config.h)
 
 case "${host_os}" in
@@ -29,17 +47,10 @@
 # messages
 library_not_found="Could not find required library!"
 function_not_found="Could not find required function!"
-using_dlopen_crypto_libs="Using libaacs and libbdplus via dlopen."
-using_normal_linking="Using libaacs and libbdplus via normal linking."
 libxml2_missing="Could not find libxml2 - disclib meta parser disabled."
 pkg_config_missing="Could not find pkg-config.  Assuming..."
 
 # configure options
-AC_ARG_WITH([dlopen-crypto-libs],
-  [AS_HELP_STRING([--with-dlopen-crypto-libs],
-  [use libaacs and libbdplus via dlopen (default is auto)])],
-  [use_dlopen_crypto_libs=$withval],
-  [use_dlopen_crypto_libs=auto])
 
 AC_ARG_WITH([jdk],
   AS_HELP_STRING([--with-jdk=DIR],
@@ -88,6 +99,12 @@
   [use_bdjava=$enableval],
   [use_bdjava=no])
 
+AC_ARG_ENABLE([libxml2],
+  [AS_HELP_STRING([--enable-libxml2],
+  [enable libxml2 support (default is yes)])],
+  [use_libxml2=$enableval],
+  [use_libxml2=yes])
+
 # required programs
 AC_PROG_CC
 AC_PROG_LIBTOOL
@@ -98,7 +115,7 @@
 # required headers
 AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h])
 AC_CHECK_HEADERS([stdlib.h mntent.h linux/cdrom.h inttypes.h strings.h])
-AC_CHECK_HEADERS([sys/time.h time.h])
+AC_CHECK_HEADERS([sys/time.h time.h mntent.h])
 if test "${SYS}" != "mingw32" ; then
     AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([pthread.h required])])
 fi
@@ -119,42 +136,28 @@
 fi
 
 # dlopen check
-if [[ $use_dlopen_crypto_libs = "auto" ]]; then
-  if test "${SYS}" != "mingw32" ; then
-      AC_CHECK_LIB([dl], [dlopen],
-        [DLOPEN_LDFLAGS="-ldl"; AC_MSG_NOTICE($using_dlopen_crypto_libs)
-         AC_DEFINE([DLOPEN_CRYPTO_LIBS], [1], ["Define to 1 if dlopening crypto libs"])],
-        [use_dlopen_crypto_libs="no"; AC_MSG_NOTICE($using_normal_linking)])
-  else
-         AC_DEFINE([DLOPEN_CRYPTO_LIBS], [1], ["Define to 1 if dlopening crypto libs"])
-  fi
-elif [[ $use_dlopen_crypto_libs = "yes" ]]; then
-  AC_CHECK_LIB([dl], [dlopen],
-    [DLOPEN_LDFLAGS="-ldl"; AC_MSG_NOTICE($using_dlopen_crypto_libs)
-     AC_DEFINE([DLOPEN_CRYPTO_LIBS], [1], ["Define to 1 if dlopening crypto libs"])],
-    [AC_MSG_ERROR($library_not_found)])
-else
-  AC_CHECK_LIB([aacs], [aacs_open],,
-    [AC_MSG_ERROR($library_not_found)])
-  AC_CHECK_LIB([bdplus], [bdplus_init],,
-    [AC_MSG_ERROR($library_not_found)])
-  AC_MSG_NOTICE($using_normal_linking)
+if test "${SYS}" != "mingw32" ; then
+  AC_CHECK_FUNCS(
+    [dlopen],
+    [DLOPEN_LIBS=""],
+    [AC_CHECK_LIB([dl], [dlopen],
+      [DLOPEN_LIBS="-ldl"],
+      [AC_MSG_ERROR($library_not_found)])])
 fi
-AM_CONDITIONAL([DLOPEN_CRYPTO_LIBS],
-  [test $use_dlopen_crypto_libs = "auto" || test $use_dlopen_crypto_libs = "yes"])
 
 # check for pkg-config itself so we don't try the m4 macro without pkg-config
 AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
 
 # libxml2 for metadata parser
-if test "x$HAVE_PKG_CONFIG" = "xyes"
-then
+if test "x$use_libxml2" = "xyes"; then
+  if test "x$HAVE_PKG_CONFIG" = "xyes"; then
     PKG_CHECK_MODULES([LIBXML2], libxml-2.0 >= 2.6, 
         [AC_DEFINE([HAVE_LIBXML2], [1], 
             [Define to 1 if libxml2 is to be used for metadata parsing])],
         [AC_MSG_NOTICE($libxml2_missing)])
-else
+  else
     AC_MSG_NOTICE($pkg_config_missing $libxml2_missing)
+  fi
 fi
 
 # function testing for supported compiler options
@@ -195,6 +198,10 @@
 check_cc_options -Wundef && \
   SET_WARNINGS="$SET_WARNINGS -Wundef"
 
+# no implicit function declarations
+check_cc_options -Werror-implicit-function-declaration && \
+  SET_WARNINGS="$SET_WARNINGS -Werror-implicit-function-declaration"
+
 # use -Werror
 if [[ $use_werror = "yes" ]]; then
   check_cc_options -Werror && \
@@ -255,11 +262,35 @@
 # generate documentation
 DX_INIT_DOXYGEN(libbluray, doc/doxygen-config, [doc/doxygen])
 
+# export library version number
+BLURAY_VERSION_MAJOR=bluray_major()
+AC_SUBST(BLURAY_VERSION_MAJOR)
+BLURAY_VERSION_MINOR=bluray_minor()
+AC_SUBST(BLURAY_VERSION_MINOR)
+BLURAY_VERSION_MICRO=bluray_micro()
+AC_SUBST(BLURAY_VERSION_MICRO)
+
+# export library (.so) version
+LT_VERSION_INFO="lt_current():lt_revision():lt_age()"
+AC_SUBST(LT_VERSION_INFO)
+
 # generate output files
 AC_SUBST(BDJAVA_CFLAGS)
-AC_SUBST(DLOPEN_LDFLAGS)
+AC_SUBST(DLOPEN_LIBS)
 AC_SUBST(SET_WARNINGS)
 AC_SUBST(SET_OPTIMIZATIONS)
 AC_SUBST(SET_DEBUG_OPTS)
-AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/libbluray.pc])
+AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/libbluray.pc src/libbluray/bluray-version.h])
 AC_OUTPUT
+
+
+dnl ---------------------------------------------
+dnl Some infos:
+dnl ---------------------------------------------
+
+echo "  Summary:"
+echo "  --------"
+echo "  BD-J support:        $use_bdjava"
+echo "  Metadata support:    $use_libxml2"
+echo "  Build examples:      $use_examples"
+

libbluray-0.2.3.tar.bz2/m4/libtool.m4 Added

@@ -0,0 +1,8001 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file 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.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems

libbluray-0.2.3.tar.bz2/m4/ltoptions.m4 Added

@@ -0,0 +1,384 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file 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.
+
+# serial 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],

libbluray-0.2.3.tar.bz2/m4/ltsugar.m4 Added

@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file 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.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])

libbluray-0.2.3.tar.bz2/m4/ltversion.m4 Added

libbluray-0.2.3.tar.bz2/m4/lt~obsolete.m4 Added

@@ -0,0 +1,98 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file 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.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])

libbluray-0.0.1-pre-213-ga869da8.tar.gz/player_wrappers/xine/input_bluray.c -> libbluray-0.2.3.tar.bz2/player_wrappers/xine/input_bluray.c Changed

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2000-2005 the xine project
  *
- * Copyright (C) 2009 Petri Hintukainen <phintuka@users.sourceforge.net>
+ * Copyright (C) 2009-2011 Petri Hintukainen <phintuka@users.sourceforge.net>
  *
  * This file is part of xine, a free video player.
  *
@@ -38,6 +38,7 @@
 #include <string.h>
 #include <errno.h>
 #include <dlfcn.h>
+#include <pthread.h>
 
 #include <libbluray/bluray.h>
 #include <libbluray/keys.h>
@@ -51,7 +52,7 @@
 
 #define LOGMSG(x...)  xine_log (this->stream->xine, XINE_LOG_MSG, "input_bluray: " x);
 
-#define XINE_ENGINE_INTERNAL
+#define XINE_ENGINE_INTERNAL  // stream->demux_plugin
 
 #ifdef HAVE_CONFIG_H
 # include "xine_internal.h"
@@ -80,6 +81,8 @@
 #define PKT_SIZE          192
 #define TICKS_IN_MS       45
 
+#define MIN_TITLE_LENGTH  180
+
 typedef struct {
 
   input_class_t   input_class;
@@ -99,7 +102,7 @@
 
   xine_stream_t        *stream;
   xine_event_queue_t   *event_queue;
-  xine_osd_t           *osd;
+  xine_osd_t           *osd[2];
 
   bluray_input_class_t *class;
 
@@ -117,122 +120,220 @@
   int                num_titles;        /* navigation mode, number of titles in disc index */
   int                current_title;     /* navigation mode, title from disc index */
   BLURAY_TITLE_INFO *title_info;
-  int                current_clip;
+  pthread_mutex_t    title_info_mutex;  /* lock this when accessing title_info outside of input/demux thread */
+  unsigned int       current_clip;
+  time_t             still_end_time;
   int                error;
   int                menu_open;
+  int                stream_flushed;
   int                pg_enable;
   int                pg_stream;
+  int                mouse_inside_button;
 
   uint32_t           cap_seekable;
   uint8_t            nav_mode;
 
 } bluray_input_plugin_t;
 
-static void close_overlay(bluray_input_plugin_t *this)
+static void send_num_buttons(bluray_input_plugin_t *this, int n)
+{
+  xine_event_t   event;
+  xine_ui_data_t data;
+
+  event.type = XINE_EVENT_UI_NUM_BUTTONS;
+  event.data = &data;
+  event.data_length = sizeof(data);
+  data.num_buttons = n;
+
+  xine_event_send(this->stream, &event);
+}
+
+static xine_osd_t *get_overlay(bluray_input_plugin_t *this, int plane)
+{
+  if (!this->osd[plane]) {
+    this->osd[plane] = xine_osd_new(this->stream, 0, 0, 1920, 1080);
+  }
+  if (!this->pg_enable) {
+    _x_select_spu_channel(this->stream, -1);
+  }
+  return this->osd[plane];
+}
+
+static void close_overlay(bluray_input_plugin_t *this, int plane)
 {
-  if (this->osd) {
-    xine_osd_free(this->osd);
-    this->osd = NULL;
+  if (plane < 0) {
+    close_overlay(this, 0);
+    close_overlay(this, 1);
+    return;
+  }
+
+  if (plane < 2 && this->osd[plane]) {
+    xine_osd_free(this->osd[plane]);
+    this->osd[plane] = NULL;
+    if (plane == 1) {
+      send_num_buttons(this, 0);
+      this->menu_open = 0;
+    }
+  }
+}
+
+static void open_overlay(bluray_input_plugin_t *this, const BD_OVERLAY * const ov)
+{
+  if (!this->osd[ov->plane]) {
+    this->osd[ov->plane] = xine_osd_new(this->stream, ov->x, ov->y, ov->w, ov->h);
+  }
+}
+
+static void draw_bitmap(xine_osd_t *osd, const BD_OVERLAY * const ov)
+{
+  unsigned i;
+
+  /* convert and set palette */
+  if (ov->palette) {
+    uint32_t color[256];
+    uint8_t  trans[256];
+    for(i = 0; i < 256; i++) {
+      trans[i] = ov->palette[i].T;
+      color[i] = (ov->palette[i].Y << 16) | (ov->palette[i].Cr << 8) | ov->palette[i].Cb;
+    }
+
+    xine_osd_set_palette(osd, color, trans);
+  }
+
+  /* uncompress and draw bitmap */
+  if (ov->img) {
+    const BD_PG_RLE_ELEM *rlep = ov->img;
+    uint8_t *img = malloc(ov->w * ov->h);
+    unsigned pixels = ov->w * ov->h;
+
+    for (i = 0; i < pixels; i += rlep->len, rlep++) {
+      memset(img + i, rlep->color, rlep->len);
+    }
+
+    xine_osd_draw_bitmap(osd, img, ov->x, ov->y, ov->w, ov->h, NULL);
+
+    free(img);
   }
 }
 
 static void overlay_proc(void *this_gen, const BD_OVERLAY * const ov)
 {
   bluray_input_plugin_t *this = (bluray_input_plugin_t *) this_gen;
-  uint32_t color[256];
-  uint8_t  trans[256];
-  unsigned i;
 
   if (!this) {
     return;
   }
 
-  if (!ov || ov->plane == 1)
-    this->menu_open = 0;
-
-  if (!ov || !ov->img) {
+  if (!ov) {
     /* hide OSD */
-    close_overlay(this);
+    close_overlay(this, -1);
     return;
   }
 
-  /* open xine OSD */
-
-  if (!this->osd) {
-    this->osd = xine_osd_new(this->stream, 0, 0, 1920, 1080);
+  if (ov->plane > 1) {
+    return;
   }
-  if (!this->pg_enable)
-    _x_select_spu_channel(this->stream, -1);
 
-  /* convert and set palette */
+#if defined(BD_OVERLAY_INTERFACE_VERSION) && BD_OVERLAY_INTERFACE_VERSION >= 2
 
-  for(i = 0; i < 256; i++) {
-    trans[i] = ov->palette[i].T;
-    color[i] = (ov->palette[i].Y << 16) | (ov->palette[i].Cr << 8) | ov->palette[i].Cb;
+  switch (ov->cmd) {
+    case BD_OVERLAY_INIT:    /* init overlay plane. Size of full plane in x,y,w,h */
+      open_overlay(this, ov);
+      return;
+    case BD_OVERLAY_CLOSE:   /* close overlay */
+      close_overlay(this, ov->plane);
+      return;
   }
 
-  xine_osd_set_palette(this->osd, color, trans);
+  xine_osd_t *osd = get_overlay(this, ov->plane);
 
-  /* uncompress and draw bitmap */

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/Makefile.am -> libbluray-0.2.3.tar.bz2/src/Makefile.am Changed

@@ -1,13 +1,8 @@
-# library version info
-# NOTE: this is not the same as the library's release number
-LIB_CURRENT=0
-LIB_REVISION=0
-LIB_AGE=0
-LIB_VERSION_INFO="$(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE)"
+LIB_VERSION_INFO="@LT_VERSION_INFO@"
 
 SUBDIRS= . examples
 
-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
+SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200809L -D_REENTRANT
 SET_WARNINGS = @SET_WARNINGS@
 SET_OPTIMIZATIONS = @SET_OPTIMIZATIONS@
 SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
@@ -28,6 +23,8 @@
 	libbluray/bdj/native/org_videolan_Libbluray.h \
 	libbluray/bdj/native/org_videolan_Libbluray.c
 
+EXTRA_DIST = libbluray/bdj/build.xml libbluray/bdj/java
+
 lib_LTLIBRARIES=libbluray.la
 libbluray_ladir= $(includedir)/libbluray
 libbluray_la_SOURCES=libbluray/bluray.h \
@@ -85,19 +82,21 @@
 	util/strutl.c \
 	util/strutl.h \
 	util/macro.h \
+	util/mutex.h \
 	util/logging.c \
 	util/log_control.h \
 	util/bits.h \
 	util/logging.h
-libbluray_la_HEADERS= libbluray/bluray.h file/filesystem.h util/log_control.h libbluray/keys.h libbluray/decoders/overlay.h libbluray/bdnav/meta_data.h libbluray/bdnav/clpi_data.h
-libbluray_la_LDFLAGS= -version-info $(LIB_VERSION_INFO) $(DLOPEN_LDFLAGS) $(LIBXML2_LIBS)
+libbluray_la_HEADERS= libbluray/bluray.h file/filesystem.h util/log_control.h libbluray/keys.h libbluray/decoders/overlay.h libbluray/bdnav/meta_data.h libbluray/bdnav/clpi_data.h libbluray/bluray-version.h
+libbluray_la_LDFLAGS= -version-info $(LIB_VERSION_INFO)
+libbluray_la_LIBADD= $(LIBXML2_LIBS) $(DLOPEN_LIBS)
 
 if USING_BDJAVA
 libbluray_la_SOURCES+=$(SOURCES_bdj)
 AM_CFLAGS+=@BDJAVA_CFLAGS@
 
 all-local:
-	ant -f libbluray/bdj/build.xml
+	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig

libbluray-0.2.3.tar.bz2/src/Makefile.in Added

@@ -0,0 +1,1094 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
+
+@SET_MAKE@
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+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 = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@USING_BDJAVA_TRUE@am__append_1 = $(SOURCES_bdj)
+@USING_BDJAVA_TRUE@am__append_2 = @BDJAVA_CFLAGS@
+subdir = src
+DIST_COMMON = $(libbluray_la_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/libbluray.pc.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(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 = libbluray.pc
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(libbluray_ladir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libbluray_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__libbluray_la_SOURCES_DIST = libbluray/bluray.h libbluray/bluray.c \
+	libbluray/register.h libbluray/register.c libbluray/keys.h \
+	libbluray/bdnav libbluray/bdnav/bdparse.h \
+	libbluray/bdnav/uo_mask_table.h libbluray/bdnav/navigation.h \
+	libbluray/bdnav/index_parse.c libbluray/bdnav/navigation.c \
+	libbluray/bdnav/sound_parse.c libbluray/bdnav/sound_parse.h \
+	libbluray/bdnav/mpls_parse.h libbluray/bdnav/clpi_parse.c \
+	libbluray/bdnav/mpls_parse.c libbluray/bdnav/index_parse.h \
+	libbluray/bdnav/clpi_parse.h libbluray/bdnav/meta_data.h \
+	libbluray/bdnav/meta_parse.c libbluray/bdnav/meta_parse.h \
+	libbluray/decoders libbluray/decoders/pes_buffer.h \
+	libbluray/decoders/pes_buffer.c \
+	libbluray/decoders/m2ts_demux.h \
+	libbluray/decoders/m2ts_demux.c libbluray/decoders/overlay.h \
+	libbluray/decoders/pg.h libbluray/decoders/pg_decode.h \
+	libbluray/decoders/pg_decode.c libbluray/decoders/ig.h \
+	libbluray/decoders/ig_decode.h libbluray/decoders/ig_decode.c \
+	libbluray/decoders/graphics_processor.h \
+	libbluray/decoders/graphics_processor.c \
+	libbluray/decoders/graphics_controller.h \
+	libbluray/decoders/graphics_controller.c libbluray/hdmv \
+	libbluray/hdmv/hdmv_insn.h libbluray/hdmv/hdmv_vm.h \
+	libbluray/hdmv/hdmv_vm.c libbluray/hdmv/mobj_parse.h \
+	libbluray/hdmv/mobj_parse.c libbluray/hdmv/mobj_print.c \
+	file/dir_posix.c file/file.h file/file_posix.c file/dl.h \
+	file/dl_posix.c file/filesystem.h file/filesystem.c \
+	util/attributes.h util/strutl.c util/strutl.h util/macro.h \
+	util/mutex.h util/logging.c util/log_control.h util/bits.h \
+	util/logging.h libbluray/bdj/bdj.h libbluray/bdj/bdj_private.h \
+	libbluray/bdj/bdj_util.h libbluray/bdj/bdj_util.c \
+	libbluray/bdj/bdj.c libbluray/bdj/bdjo_parser.h \
+	libbluray/bdj/bdjo_parser.c libbluray/bdj/common.h \
+	libbluray/bdj/native/org_videolan_Libbluray.h \
+	libbluray/bdj/native/org_videolan_Libbluray.c
+am__objects_1 = bdj_util.lo bdj.lo bdjo_parser.lo \
+	org_videolan_Libbluray.lo
+@USING_BDJAVA_TRUE@am__objects_2 = $(am__objects_1)
+am_libbluray_la_OBJECTS = bluray.lo register.lo index_parse.lo \
+	navigation.lo sound_parse.lo clpi_parse.lo mpls_parse.lo \
+	meta_parse.lo pes_buffer.lo m2ts_demux.lo pg_decode.lo \
+	ig_decode.lo graphics_processor.lo graphics_controller.lo \
+	hdmv_vm.lo mobj_parse.lo mobj_print.lo dir_posix.lo \
+	file_posix.lo dl_posix.lo filesystem.lo strutl.lo logging.lo \
+	$(am__objects_2)
+libbluray_la_OBJECTS = $(am_libbluray_la_OBJECTS)
+libbluray_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libbluray_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libbluray_la_SOURCES)
+DIST_SOURCES = $(am__libbluray_la_SOURCES_DIST)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+DATA = $(pkgconfig_DATA)
+HEADERS = $(libbluray_la_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/Makefile.am -> libbluray-0.2.3.tar.bz2/src/examples/Makefile.am Changed

libbluray-0.2.3.tar.bz2/src/examples/Makefile.in Added

@@ -0,0 +1,924 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+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 = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@USING_EXAMPLES_TRUE@noinst_PROGRAMS = bdsplice$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	mpls_dump$(EXEEXT) clpi_dump$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	index_dump$(EXEEXT) mobj_dump$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	sound_dump$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	libbluray_test$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	list_titles$(EXEEXT) hdmv_test$(EXEEXT) \
+@USING_EXAMPLES_TRUE@	$(am__EXEEXT_1)
+@USING_EXAMPLES_TRUE@bin_PROGRAMS = bd_info$(EXEEXT)
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__append_1 = @BDJAVA_CFLAGS@
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__append_2 = bdj_test
+subdir = src/examples
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(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__installdirs = "$(DESTDIR)$(bindir)"
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__EXEEXT_1 =  \
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	bdj_test$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am__bd_info_SOURCES_DIST = bd_info.c
+@USING_EXAMPLES_TRUE@am_bd_info_OBJECTS = bd_info.$(OBJEXT)
+bd_info_OBJECTS = $(am_bd_info_OBJECTS)
+@USING_EXAMPLES_TRUE@bd_info_DEPENDENCIES = $(BLURAY_LIB)
+am__bdj_test_SOURCES_DIST = bdj_test.c
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am_bdj_test_OBJECTS =  \
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	bdj_test.$(OBJEXT)
+bdj_test_OBJECTS = $(am_bdj_test_OBJECTS)
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@bdj_test_DEPENDENCIES =  \
+@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@	$(BLURAY_LIB)
+am__bdsplice_SOURCES_DIST = bdsplice.c
+@USING_EXAMPLES_TRUE@am_bdsplice_OBJECTS = bdsplice.$(OBJEXT)
+bdsplice_OBJECTS = $(am_bdsplice_OBJECTS)
+@USING_EXAMPLES_TRUE@bdsplice_DEPENDENCIES = $(BLURAY_LIB)
+am__clpi_dump_SOURCES_DIST = clpi_dump.c util.c util.h \
+	../util/logging.c ../file/file_posix.c \
+	../libbluray/bdnav/clpi_parse.c
+@USING_EXAMPLES_TRUE@am_clpi_dump_OBJECTS = clpi_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util.$(OBJEXT) logging.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	file_posix.$(OBJEXT) clpi_parse.$(OBJEXT)
+clpi_dump_OBJECTS = $(am_clpi_dump_OBJECTS)
+clpi_dump_LDADD = $(LDADD)
+am__hdmv_test_SOURCES_DIST = hdmv_test.c
+@USING_EXAMPLES_TRUE@am_hdmv_test_OBJECTS = hdmv_test.$(OBJEXT)
+hdmv_test_OBJECTS = $(am_hdmv_test_OBJECTS)
+@USING_EXAMPLES_TRUE@hdmv_test_DEPENDENCIES = $(BLURAY_LIB)
+am__index_dump_SOURCES_DIST = index_dump.c ../util/logging.c \
+	../file/file_posix.c ../libbluray/bdnav/index_parse.c
+@USING_EXAMPLES_TRUE@am_index_dump_OBJECTS = index_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	index_parse.$(OBJEXT)
+index_dump_OBJECTS = $(am_index_dump_OBJECTS)
+index_dump_LDADD = $(LDADD)
+am__libbluray_test_SOURCES_DIST = libbluray_test.c ../util/logging.c
+@USING_EXAMPLES_TRUE@am_libbluray_test_OBJECTS =  \
+@USING_EXAMPLES_TRUE@	libbluray_test.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT)
+libbluray_test_OBJECTS = $(am_libbluray_test_OBJECTS)
+@USING_EXAMPLES_TRUE@libbluray_test_DEPENDENCIES = $(BLURAY_LIB)
+am__list_titles_SOURCES_DIST = list_titles.c ../util/logging.c
+@USING_EXAMPLES_TRUE@am_list_titles_OBJECTS = list_titles.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT)
+list_titles_OBJECTS = $(am_list_titles_OBJECTS)
+@USING_EXAMPLES_TRUE@list_titles_DEPENDENCIES = $(BLURAY_LIB)
+am__mobj_dump_SOURCES_DIST = mobj_dump.c ../util/logging.c \
+	../file/file_posix.c ../libbluray/hdmv/mobj_parse.c \
+	../libbluray/hdmv/mobj_print.c
+@USING_EXAMPLES_TRUE@am_mobj_dump_OBJECTS = mobj_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	mobj_parse.$(OBJEXT) mobj_print.$(OBJEXT)
+mobj_dump_OBJECTS = $(am_mobj_dump_OBJECTS)
+mobj_dump_LDADD = $(LDADD)
+am__mpls_dump_SOURCES_DIST = mpls_dump.c util.c util.h \
+	../util/strutl.c ../util/logging.c ../file/file_posix.c \
+	../file/dir_posix.c ../libbluray/bdnav/mpls_parse.c \
+	../libbluray/bdnav/clpi_parse.c \
+	../libbluray/bdnav/navigation.c
+@USING_EXAMPLES_TRUE@am_mpls_dump_OBJECTS = mpls_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	util.$(OBJEXT) strutl.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	dir_posix.$(OBJEXT) mpls_parse.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	clpi_parse.$(OBJEXT) navigation.$(OBJEXT)
+mpls_dump_OBJECTS = $(am_mpls_dump_OBJECTS)
+mpls_dump_LDADD = $(LDADD)
+am__sound_dump_SOURCES_DIST = sound_dump.c ../util/logging.c \
+	../file/file_posix.c ../libbluray/bdnav/sound_parse.c
+@USING_EXAMPLES_TRUE@am_sound_dump_OBJECTS = sound_dump.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	logging.$(OBJEXT) file_posix.$(OBJEXT) \
+@USING_EXAMPLES_TRUE@	sound_parse.$(OBJEXT)
+sound_dump_OBJECTS = $(am_sound_dump_OBJECTS)
+sound_dump_LDADD = $(LDADD)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(bd_info_SOURCES) $(bdj_test_SOURCES) $(bdsplice_SOURCES) \
+	$(clpi_dump_SOURCES) $(hdmv_test_SOURCES) \
+	$(index_dump_SOURCES) $(libbluray_test_SOURCES) \
+	$(list_titles_SOURCES) $(mobj_dump_SOURCES) \
+	$(mpls_dump_SOURCES) $(sound_dump_SOURCES)
+DIST_SOURCES = $(am__bd_info_SOURCES_DIST) \
+	$(am__bdj_test_SOURCES_DIST) $(am__bdsplice_SOURCES_DIST) \
+	$(am__clpi_dump_SOURCES_DIST) $(am__hdmv_test_SOURCES_DIST) \
+	$(am__index_dump_SOURCES_DIST) \
+	$(am__libbluray_test_SOURCES_DIST) \
+	$(am__list_titles_SOURCES_DIST) $(am__mobj_dump_SOURCES_DIST) \
+	$(am__mpls_dump_SOURCES_DIST) $(am__sound_dump_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BDJAVA_CFLAGS = @BDJAVA_CFLAGS@
+BLURAY_VERSION_MAJOR = @BLURAY_VERSION_MAJOR@
+BLURAY_VERSION_MICRO = @BLURAY_VERSION_MICRO@
+BLURAY_VERSION_MINOR = @BLURAY_VERSION_MINOR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = $(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
+DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+DX_CONFIG = @DX_CONFIG@
+DX_DOCDIR = @DX_DOCDIR@
+DX_DOT = @DX_DOT@
+DX_DOXYGEN = @DX_DOXYGEN@
+DX_DVIPS = @DX_DVIPS@
+DX_EGREP = @DX_EGREP@
+DX_ENV = @DX_ENV@
+DX_FLAG_chi = @DX_FLAG_chi@
+DX_FLAG_chm = @DX_FLAG_chm@
+DX_FLAG_doc = @DX_FLAG_doc@
+DX_FLAG_dot = @DX_FLAG_dot@

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/bd_info.c -> libbluray-0.2.3.tar.bz2/src/examples/bd_info.c Changed

@@ -50,6 +50,34 @@
     return "<undefined>";
 }
 
+static const char *_hex2str(const uint8_t *data, size_t len)
+{
+    static char *str = NULL;
+    size_t i;
+
+    str = realloc(str, 2*len + 1);
+    *str = 0;
+
+    for (i = 0; i < len; i++) {
+        sprintf(str+2*i, "%02X", data[i]);
+    }
+
+    return str;
+}
+
+static const char *_aacs_error2str(int error_code)
+{
+    switch (error_code) {
+        case BD_AACS_CORRUPTED_DISC: return "corrupted BluRay disc";
+        case BD_AACS_NO_CONFIG:      return "AACS configuration file missing";
+        case BD_AACS_NO_PK:          return "no matching processing key";
+        case BD_AACS_NO_CERT:        return "no valid AACS certificate";
+        case BD_AACS_CERT_REVOKED:   return "AACS certificate revoked";
+        case BD_AACS_MMC_FAILED:     return "MMC authentication failed";
+    }
+    return "unknown error";
+}
+
 static const char *_res2str(int x, int y)
 {
     if (x > 0 && y > 0 && x < 0xffff && y < 0xffff) {
@@ -61,7 +89,7 @@
     return "";
 }
 
-static void _print_meta(META_DL *meta)
+static void _print_meta(const META_DL *meta)
 {
     if (!meta) {
         printf("\nNo disc library metadata\n");
@@ -130,7 +158,14 @@
     printf("\nAACS detected       : %s\n", _yes_no(info->aacs_detected));
     if (info->aacs_detected) {
         printf("libaacs detected    : %s\n", _yes_no(info->libaacs_detected));
-        printf("AACS handled        : %s\n", _yes_no(info->aacs_handled));
+        if (info->libaacs_detected) {
+          printf("Disc ID             : %s\n", _hex2str(info->disc_id, sizeof(info->disc_id)));
+          printf("AACS MKB version    : %d\n", info->aacs_mkbv);
+          printf("AACS handled        : %s\n", _yes_no(info->aacs_handled));
+          if (!info->aacs_handled) {
+            printf("                      (%s)\n", _aacs_error2str(info->aacs_error_code));
+          }
+        }
     }
 
     printf("\nBD+ detected        : %s\n", _yes_no(info->bdplus_detected));
@@ -141,5 +176,7 @@
 
     _print_meta(bd_get_meta(bd));
 
+    bd_close(bd);
+
     return 0;
 }

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/bdj_test.c -> libbluray-0.2.3.tar.bz2/src/examples/bdj_test.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/bdsplice.c -> libbluray-0.2.3.tar.bz2/src/examples/bdsplice.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/hdmv_test.c -> libbluray-0.2.3.tar.bz2/src/examples/hdmv_test.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/libbluray_test.c -> libbluray-0.2.3.tar.bz2/src/examples/libbluray_test.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/list_titles.c -> libbluray-0.2.3.tar.bz2/src/examples/list_titles.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/mpls_dump.c -> libbluray-0.2.3.tar.bz2/src/examples/mpls_dump.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/examples/util.c -> libbluray-0.2.3.tar.bz2/src/examples/util.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/file/file.h -> libbluray-0.2.3.tar.bz2/src/file/file.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/file/file_posix.c -> libbluray-0.2.3.tar.bz2/src/file/file_posix.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdj/native/org_videolan_Libbluray.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdj/native/org_videolan_Libbluray.c Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/clpi_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/clpi_parse.c Changed

@@ -323,7 +323,7 @@
 }
 
 static uint32_t
-_find_stc_spn(CLPI_CL *cl, uint8_t stc_id)
+_find_stc_spn(const CLPI_CL *cl, uint8_t stc_id)
 {
     int ii;
     CLPI_ATC_SEQ *atc;
@@ -341,10 +341,10 @@
 // Returns the spn for the entry that is closest to but
 // before the given timestamp
 uint32_t
-clpi_lookup_spn(CLPI_CL *cl, uint32_t timestamp, int before, uint8_t stc_id)
+clpi_lookup_spn(const CLPI_CL *cl, uint32_t timestamp, int before, uint8_t stc_id)
 {
-    CLPI_EP_MAP_ENTRY *entry;
-    CLPI_CPI *cpi = &cl->cpi;
+    const CLPI_EP_MAP_ENTRY *entry;
+    const CLPI_CPI *cpi = &cl->cpi;
     int ii, jj;
     uint32_t coarse_pts, pts; // 45khz timestamps
     uint32_t spn, coarse_spn, stc_spn;
@@ -447,10 +447,10 @@
 // Returns the spn for the entry that is closest to but
 // before the given packet
 uint32_t
-clpi_access_point(CLPI_CL *cl, uint32_t pkt, int next, int angle_change, uint32_t *time)
+clpi_access_point(const CLPI_CL *cl, uint32_t pkt, int next, int angle_change, uint32_t *time)
 {
-    CLPI_EP_MAP_ENTRY *entry;
-    CLPI_CPI *cpi = &cl->cpi;
+    const CLPI_EP_MAP_ENTRY *entry;
+    const CLPI_CPI *cpi = &cl->cpi;
     int ii, jj;
     uint32_t coarse_spn, spn;
     int start, end;
@@ -575,8 +575,8 @@
     X_FREE(cl);
 }
 
-CLPI_CL*
-clpi_parse(char *path, int verbose)
+static CLPI_CL*
+_clpi_parse(const char *path, int verbose)
 {
     BITSTREAM  bits;
     BD_FILE_H *fp;
@@ -627,84 +627,109 @@
 }
 
 CLPI_CL*
-clpi_copy(CLPI_CL* dest_cl, CLPI_CL* src_cl)
+clpi_parse(const char *path, int verbose)
+{
+    CLPI_CL *cl = _clpi_parse(path, verbose);
+
+    /* if failed, try backup file */
+    if (!cl) {
+        int   len    = strlen(path);
+        char *backup = malloc(len + 8);
+
+        strncpy(backup, path, len - 18);
+        strcpy(backup + len - 18, "BACKUP/");
+        strcpy(backup + len - 18 + 7, path + len - 18);
+
+        cl = _clpi_parse(backup, verbose);
+
+        X_FREE(backup);
+    }
+
+    return cl;
+}
+
+CLPI_CL*
+clpi_copy(const CLPI_CL* src_cl)
 {
+    CLPI_CL* dest_cl = NULL;
     int ii, jj;
-    if (dest_cl && src_cl) {
-      dest_cl->clip.clip_stream_type = src_cl->clip.clip_stream_type;
-      dest_cl->clip.application_type = src_cl->clip.application_type;
-      dest_cl->clip.is_atc_delta = src_cl->clip.is_atc_delta;
-      dest_cl->clip.atc_delta_count = src_cl->clip.atc_delta_count;
-      dest_cl->clip.ts_recording_rate = src_cl->clip.ts_recording_rate;
-      dest_cl->clip.num_source_packets = src_cl->clip.num_source_packets;
-      dest_cl->clip.ts_type_info.validity = src_cl->clip.ts_type_info.validity;
-      memcpy(dest_cl->clip.ts_type_info.format_id, src_cl->clip.ts_type_info.format_id, 5);
-      dest_cl->clip.atc_delta = malloc(src_cl->clip.atc_delta_count * sizeof(CLPI_ATC_DELTA));
-      for (ii = 0; ii < src_cl->clip.atc_delta_count; ii++) {
-        dest_cl->clip.atc_delta[ii].delta =  src_cl->clip.atc_delta[ii].delta;
-	memcpy(dest_cl->clip.atc_delta[ii].file_id, src_cl->clip.atc_delta[ii].file_id, 6);
-	memcpy(dest_cl->clip.atc_delta[ii].file_code, src_cl->clip.atc_delta[ii].file_code, 5);
-      }
-
-      dest_cl->sequence.num_atc_seq = src_cl->sequence.num_atc_seq;
-      dest_cl->sequence.atc_seq = malloc(src_cl->sequence.num_atc_seq * sizeof(CLPI_ATC_SEQ));
-      for (ii = 0; ii < src_cl->sequence.num_atc_seq; ii++) {
-	dest_cl->sequence.atc_seq[ii].spn_atc_start = src_cl->sequence.atc_seq[ii].spn_atc_start;
-	dest_cl->sequence.atc_seq[ii].offset_stc_id = src_cl->sequence.atc_seq[ii].offset_stc_id;
-	dest_cl->sequence.atc_seq[ii].num_stc_seq = src_cl->sequence.atc_seq[ii].num_stc_seq;
-	dest_cl->sequence.atc_seq[ii].stc_seq = malloc(src_cl->sequence.atc_seq[ii].num_stc_seq * sizeof(CLPI_STC_SEQ));
-        for (jj = 0; jj < src_cl->sequence.atc_seq[ii].num_stc_seq; jj++) {
-	    dest_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start = src_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start;
-	    dest_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid = src_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid;
-	    dest_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_start_time = src_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_start_time;
-	    dest_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_end_time = src_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_end_time;
+
+    if (src_cl) {
+        dest_cl = (CLPI_CL*) calloc(1, sizeof(CLPI_CL));
+
+        dest_cl->clip.clip_stream_type = src_cl->clip.clip_stream_type;
+        dest_cl->clip.application_type = src_cl->clip.application_type;
+        dest_cl->clip.is_atc_delta = src_cl->clip.is_atc_delta;
+        dest_cl->clip.atc_delta_count = src_cl->clip.atc_delta_count;
+        dest_cl->clip.ts_recording_rate = src_cl->clip.ts_recording_rate;
+        dest_cl->clip.num_source_packets = src_cl->clip.num_source_packets;
+        dest_cl->clip.ts_type_info.validity = src_cl->clip.ts_type_info.validity;
+        memcpy(dest_cl->clip.ts_type_info.format_id, src_cl->clip.ts_type_info.format_id, 5);
+        dest_cl->clip.atc_delta = malloc(src_cl->clip.atc_delta_count * sizeof(CLPI_ATC_DELTA));
+        for (ii = 0; ii < src_cl->clip.atc_delta_count; ii++) {
+            dest_cl->clip.atc_delta[ii].delta =  src_cl->clip.atc_delta[ii].delta;
+            memcpy(dest_cl->clip.atc_delta[ii].file_id, src_cl->clip.atc_delta[ii].file_id, 6);
+            memcpy(dest_cl->clip.atc_delta[ii].file_code, src_cl->clip.atc_delta[ii].file_code, 5);
+        }
+
+        dest_cl->sequence.num_atc_seq = src_cl->sequence.num_atc_seq;
+        dest_cl->sequence.atc_seq = malloc(src_cl->sequence.num_atc_seq * sizeof(CLPI_ATC_SEQ));
+        for (ii = 0; ii < src_cl->sequence.num_atc_seq; ii++) {
+            dest_cl->sequence.atc_seq[ii].spn_atc_start = src_cl->sequence.atc_seq[ii].spn_atc_start;
+            dest_cl->sequence.atc_seq[ii].offset_stc_id = src_cl->sequence.atc_seq[ii].offset_stc_id;
+            dest_cl->sequence.atc_seq[ii].num_stc_seq = src_cl->sequence.atc_seq[ii].num_stc_seq;
+            dest_cl->sequence.atc_seq[ii].stc_seq = malloc(src_cl->sequence.atc_seq[ii].num_stc_seq * sizeof(CLPI_STC_SEQ));
+            for (jj = 0; jj < src_cl->sequence.atc_seq[ii].num_stc_seq; jj++) {
+                dest_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start = src_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start;
+                dest_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid = src_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid;
+                dest_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_start_time = src_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_start_time;
+                dest_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_end_time = src_cl->sequence.atc_seq[ii].stc_seq[jj].presentation_end_time;
+            }
+        }
+
+        dest_cl->program.num_prog = src_cl->program.num_prog;
+        dest_cl->program.progs = malloc(src_cl->program.num_prog * sizeof(CLPI_PROG));
+        for (ii = 0; ii < src_cl->program.num_prog; ii++) {
+            dest_cl->program.progs[ii].spn_program_sequence_start = src_cl->program.progs[ii].spn_program_sequence_start;
+            dest_cl->program.progs[ii].program_map_pid = src_cl->program.progs[ii].program_map_pid;
+            dest_cl->program.progs[ii].num_streams = src_cl->program.progs[ii].num_streams;
+            dest_cl->program.progs[ii].num_groups = src_cl->program.progs[ii].num_groups;
+            dest_cl->program.progs[ii].streams = malloc(src_cl->program.progs[ii].num_streams * sizeof(CLPI_PROG_STREAM));
+            for (jj = 0; jj < src_cl->program.progs[ii].num_streams; jj++) {
+                dest_cl->program.progs[ii].streams[jj].coding_type = src_cl->program.progs[ii].streams[jj].coding_type;
+                dest_cl->program.progs[ii].streams[jj].pid = src_cl->program.progs[ii].streams[jj].pid;
+                dest_cl->program.progs[ii].streams[jj].format = src_cl->program.progs[ii].streams[jj].format;
+                dest_cl->program.progs[ii].streams[jj].rate = src_cl->program.progs[ii].streams[jj].rate;
+                dest_cl->program.progs[ii].streams[jj].aspect = src_cl->program.progs[ii].streams[jj].aspect;
+                dest_cl->program.progs[ii].streams[jj].oc_flag = src_cl->program.progs[ii].streams[jj].oc_flag;
+                dest_cl->program.progs[ii].streams[jj].char_code = src_cl->program.progs[ii].streams[jj].char_code;
+                memcpy(dest_cl->program.progs[ii].streams[jj].lang,src_cl->program.progs[ii].streams[jj].lang,4);
+            }
         }
-      }
-
-      dest_cl->program.num_prog = src_cl->program.num_prog;
-      dest_cl->program.progs = malloc(src_cl->program.num_prog * sizeof(CLPI_PROG));
-      for (ii = 0; ii < src_cl->program.num_prog; ii++) {
-	dest_cl->program.progs[ii].spn_program_sequence_start = src_cl->program.progs[ii].spn_program_sequence_start;
-	dest_cl->program.progs[ii].program_map_pid = src_cl->program.progs[ii].program_map_pid;
-	dest_cl->program.progs[ii].num_streams = src_cl->program.progs[ii].num_streams;
-	dest_cl->program.progs[ii].num_groups = src_cl->program.progs[ii].num_groups;
-	dest_cl->program.progs[ii].streams = malloc(src_cl->program.progs[ii].num_streams * sizeof(CLPI_PROG_STREAM));
-	for (jj = 0; jj < src_cl->program.progs[ii].num_streams; jj++) {
-	  dest_cl->program.progs[ii].streams[jj].coding_type = src_cl->program.progs[ii].streams[jj].coding_type;
-	  dest_cl->program.progs[ii].streams[jj].pid = src_cl->program.progs[ii].streams[jj].pid;
-	  dest_cl->program.progs[ii].streams[jj].format = src_cl->program.progs[ii].streams[jj].format;
-	  dest_cl->program.progs[ii].streams[jj].rate = src_cl->program.progs[ii].streams[jj].rate;
-	  dest_cl->program.progs[ii].streams[jj].aspect = src_cl->program.progs[ii].streams[jj].aspect;
-	  dest_cl->program.progs[ii].streams[jj].oc_flag = src_cl->program.progs[ii].streams[jj].oc_flag;
-	  dest_cl->program.progs[ii].streams[jj].char_code = src_cl->program.progs[ii].streams[jj].char_code;
-	  memcpy(dest_cl->program.progs[ii].streams[jj].lang,src_cl->program.progs[ii].streams[jj].lang,4);
-	}
-      }
-
-      dest_cl->cpi.num_stream_pid = src_cl->cpi.num_stream_pid;
-      dest_cl->cpi.entry = malloc(src_cl->cpi.num_stream_pid * sizeof(CLPI_EP_MAP_ENTRY));
-      for (ii = 0; ii < dest_cl->cpi.num_stream_pid; ii++) {
-	dest_cl->cpi.entry[ii].pid = src_cl->cpi.entry[ii].pid;
-	dest_cl->cpi.entry[ii].ep_stream_type = src_cl->cpi.entry[ii].ep_stream_type;
-	dest_cl->cpi.entry[ii].num_ep_coarse = src_cl->cpi.entry[ii].num_ep_coarse;
-	dest_cl->cpi.entry[ii].num_ep_fine = src_cl->cpi.entry[ii].num_ep_fine;
-	dest_cl->cpi.entry[ii].ep_map_stream_start_addr = src_cl->cpi.entry[ii].ep_map_stream_start_addr;
-	dest_cl->cpi.entry[ii].coarse = malloc(src_cl->cpi.entry[ii].num_ep_coarse * sizeof(CLPI_EP_COARSE));
-	for (jj = 0; jj < src_cl->cpi.entry[ii].num_ep_coarse; jj++) {
-	  dest_cl->cpi.entry[ii].coarse[jj].ref_ep_fine_id = src_cl->cpi.entry[ii].coarse[jj].ref_ep_fine_id;
-	  dest_cl->cpi.entry[ii].coarse[jj].pts_ep = src_cl->cpi.entry[ii].coarse[jj].pts_ep;
-	  dest_cl->cpi.entry[ii].coarse[jj].spn_ep = src_cl->cpi.entry[ii].coarse[jj].spn_ep;
-	}
-	dest_cl->cpi.entry[ii].fine = malloc(src_cl->cpi.entry[ii].num_ep_fine * sizeof(CLPI_EP_FINE));
-	for (jj = 0; jj < src_cl->cpi.entry[ii].num_ep_fine; jj++) {
-	  dest_cl->cpi.entry[ii].fine[jj].is_angle_change_point = src_cl->cpi.entry[ii].fine[jj].is_angle_change_point;
-	  dest_cl->cpi.entry[ii].fine[jj].i_end_position_offset = src_cl->cpi.entry[ii].fine[jj].i_end_position_offset;

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/clpi_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/clpi_parse.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/index_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/index_parse.c Changed

@@ -66,7 +66,12 @@
 
     index_len = bs_read(bs, 32);
 
-    /* TODO: check if goes to extension data area or EOF */
+    /* TODO: check if goes to extension data area */
+
+    if ((bs_end(bs) - bs_pos(bs))/8 < (off_t)index_len) {
+        BD_DEBUG(DBG_NAV | DBG_CRIT, "index.bdmv: invalid index_len %d !\n", index_len);
+        return 0;
+    }
 
     if (!_parse_playback_obj(bs, &index->first_play) ||
         !_parse_playback_obj(bs, &index->top_menu)) {
@@ -144,7 +149,7 @@
     return 1;
 }
 
-INDX_ROOT *indx_parse(const char *file_name)
+static INDX_ROOT *_indx_parse(const char *file_name)
 {
     BITSTREAM  bs;
     BD_FILE_H *fp;
@@ -188,6 +193,26 @@
     return NULL;
 }
 
+INDX_ROOT *indx_parse(const char *file_name)
+{
+    INDX_ROOT *indx = _indx_parse(file_name);
+
+    /* if failed, try backup file */
+    if (!indx) {
+        int   len    = strlen(file_name);
+        char *backup = malloc(len + 8);
+
+        strcpy(backup, file_name);
+        strcpy(backup + len - 10, "BACKUP/index.bdmv");
+
+        indx = _indx_parse(backup);
+
+        X_FREE(backup);
+    }
+
+    return indx;
+}
+
 void indx_free(INDX_ROOT **p)
 {
     if (p && *p) {

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/meta_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/meta_parse.c Changed

@@ -43,46 +43,52 @@
 #include <libxml/tree.h>
 #endif
 
+#define BAD_CAST_CONST (const xmlChar *)
+
+
 #ifdef HAVE_LIBXML2
 static void _parseManifestNode(xmlNode * a_node, META_DL *disclib)
 {
     xmlNode *cur_node = NULL;
+    xmlChar *tmp;
 
     for (cur_node = a_node; cur_node; cur_node = cur_node->next) {
         if (cur_node->type == XML_ELEMENT_NODE) {
-            if (xmlStrEqual(cur_node->parent->name, xmlCharStrdup("title"))) {
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("name"))) {
-                    disclib->di_name = (char*)xmlStrdup(xmlNodeGetContent(cur_node));
+            if (xmlStrEqual(cur_node->parent->name, BAD_CAST_CONST "title")) {
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "name")) {
+                    disclib->di_name = (char*)xmlNodeGetContent(cur_node);
                 }
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("alternative"))) {
-                    disclib->di_alternative = (char*)xmlStrdup(xmlNodeGetContent(cur_node));
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "alternative")) {
+                    disclib->di_alternative = (char*)xmlNodeGetContent(cur_node);
                 }
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("numSets"))) {
-                    disclib->di_num_sets = atoi((char*)xmlNodeGetContent(cur_node));
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "numSets")) {
+                    disclib->di_num_sets = atoi((char*)(tmp = xmlNodeGetContent(cur_node)));
+                    xmlFree(tmp);
                 }
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("setNumber"))) {
-                    disclib->di_set_number = atoi((char*)xmlNodeGetContent(cur_node));
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "setNumber")) {
+                    disclib->di_set_number = atoi((char*)(tmp = xmlNodeGetContent(cur_node)));
+                    xmlFree(tmp);
                 }
             }
-            else if (xmlStrEqual(cur_node->parent->name, xmlCharStrdup("tableOfContents"))) {
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("titleName")) && xmlGetProp(cur_node, xmlCharStrdup("titleNumber"))) {
+            else if (xmlStrEqual(cur_node->parent->name, BAD_CAST_CONST "tableOfContents")) {
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "titleName") && (tmp = xmlGetProp(cur_node, BAD_CAST_CONST "titleNumber"))) {
                     int i = disclib->toc_count;
                     disclib->toc_count++;
                     disclib->toc_entries = realloc(disclib->toc_entries, (disclib->toc_count*sizeof(META_TITLE)));
-                    disclib->toc_entries[i].title_number = atoi((const char*)xmlGetProp(cur_node, xmlCharStrdup("titleNumber")));
-                    disclib->toc_entries[i].title_name = (char*)xmlStrdup(xmlNodeGetContent(cur_node));
+                    disclib->toc_entries[i].title_number = atoi((const char*)tmp);
+                    disclib->toc_entries[i].title_name = (char*)xmlNodeGetContent(cur_node);
+                    X_FREE(tmp);
                 }
             }
-            else if (xmlStrEqual(cur_node->parent->name, xmlCharStrdup("description"))) {
-                if (xmlStrEqual(cur_node->name, xmlCharStrdup("thumbnail")) && xmlGetProp(cur_node, xmlCharStrdup("href"))) {
+            else if (xmlStrEqual(cur_node->parent->name, BAD_CAST_CONST "description")) {
+                if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "thumbnail") && (tmp = xmlGetProp(cur_node, BAD_CAST_CONST "href"))) {
                     uint8_t i = disclib->thumb_count;
                     disclib->thumb_count++;
                     disclib->thumbnails = realloc(disclib->thumbnails, (disclib->thumb_count*sizeof(META_THUMBNAIL)));
-                    int len = xmlStrlen(xmlGetProp(cur_node, xmlCharStrdup("href")));
-                    disclib->thumbnails[i].path = (char*) malloc(len+1);
-                    strcpy(disclib->thumbnails[i].path, (char*) xmlGetProp(cur_node, xmlCharStrdup("href")));
-                    if (xmlGetProp(cur_node, xmlCharStrdup("size"))) {
-                        sscanf((const char*)xmlGetProp(cur_node, xmlCharStrdup("size")), "%ix%i", &disclib->thumbnails[i].xres, &disclib->thumbnails[i].yres);
+                    disclib->thumbnails[i].path = (char *)tmp;
+                    if ((tmp = xmlGetProp(cur_node, BAD_CAST_CONST "size"))) {
+                        sscanf((const char*)tmp, "%ix%i", &disclib->thumbnails[i].xres, &disclib->thumbnails[i].yres);
+                        X_FREE(tmp);
                     }
                     else {
                         disclib->thumbnails[i].xres = disclib->thumbnails[i].yres = -1;
@@ -144,6 +150,8 @@
         BD_FILE_H *handle = file_open(path, "rb");
         if (handle == NULL) {
             BD_DEBUG(DBG_DIR, "Failed to open meta file (%s)\n", path);
+            X_FREE(path);
+            X_FREE(base);
             continue;
         }
 
@@ -157,6 +165,8 @@
             doc = xmlReadMemory((char*)data, size_read, base, NULL, 0);
             if (doc == NULL) {
                 BD_DEBUG(DBG_DIR, "Failed to parse %s\n", path);
+                X_FREE(path);
+                X_FREE(base);
                 continue;
             }
             xmlNode *root_element = NULL;
@@ -171,6 +181,8 @@
             X_FREE(data);
         }
         file_close(handle);
+        X_FREE(path);
+        X_FREE(base);
     }
     xmlCleanupParser();
     return root;
@@ -180,7 +192,7 @@
 #endif
 }
 
-META_DL *meta_get(META_ROOT *meta_root, const char *language_code)
+const META_DL *meta_get(const META_ROOT *meta_root, const char *language_code)
 {
     unsigned i;
 
@@ -216,18 +228,19 @@
         uint8_t i;
         for (i = 0; i < (*p)->dl_count; i++) {
             uint32_t t;
-            for (t=0; i < (*p)->dl_entries[i].toc_count; t++) {
+            for (t = 0; t < (*p)->dl_entries[i].toc_count; t++) {
                 X_FREE((*p)->dl_entries[i].toc_entries[t].title_name);
-                X_FREE((*p)->dl_entries[i].toc_entries);
             }
-            for (t = 0; i < (*p)->dl_entries[i].thumb_count; t++) {
+            for (t = 0; t < (*p)->dl_entries[i].thumb_count; t++) {
                 X_FREE((*p)->dl_entries[i].thumbnails[t].path);
-                X_FREE((*p)->dl_entries[i].thumbnails);
             }
+            X_FREE((*p)->dl_entries[i].toc_entries);
+            X_FREE((*p)->dl_entries[i].thumbnails);
             X_FREE((*p)->dl_entries[i].filename);
             X_FREE((*p)->dl_entries[i].di_name);
             X_FREE((*p)->dl_entries[i].di_alternative);
         }
+        X_FREE((*p)->dl_entries);
         X_FREE(*p);
     }
 }

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/meta_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/meta_parse.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/mpls_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/mpls_parse.c Changed

@@ -401,9 +401,20 @@
 static void
 _clean_stn(MPLS_STN *stn)
 {
+    if(stn->secondary_audio) {
+        X_FREE(stn->secondary_audio->sa_primary_audio_ref);
+    }
+    if(stn->secondary_video) {
+        X_FREE(stn->secondary_video->sv_secondary_audio_ref);
+        X_FREE(stn->secondary_video->sv_pip_pg_ref);
+    }
+
     X_FREE(stn->video);
     X_FREE(stn->audio);
     X_FREE(stn->pg);
+    X_FREE(stn->ig);
+    X_FREE(stn->secondary_audio);
+    X_FREE(stn->secondary_video);
 }
 
 static int
@@ -723,8 +734,8 @@
     _clean_playlist(pl);
 }
 
-MPLS_PL*
-mpls_parse(char *path, int verbose)
+static MPLS_PL*
+_mpls_parse(const char *path, int verbose)
 {
     BITSTREAM  bits;
     BD_FILE_H *fp;
@@ -764,3 +775,24 @@
     return pl;
 }
 
+MPLS_PL*
+mpls_parse(const char *path, int verbose)
+{
+    MPLS_PL *pl = _mpls_parse(path, verbose);
+
+    /* if failed, try backup file */
+    if (!pl) {
+        int   len    = strlen(path);
+        char *backup = malloc(len + 8);
+
+        strncpy(backup, path, len - 19);
+        strcpy(backup + len - 19, "BACKUP/");
+        strcpy(backup + len - 19 + 7, path + len - 19);
+
+        pl = _mpls_parse(backup, verbose);
+
+        X_FREE(backup);
+    }
+
+    return pl;
+}

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/mpls_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/mpls_parse.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/navigation.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/navigation.c Changed

@@ -111,7 +111,7 @@
     return duration;
 }
 
-NAV_TITLE_LIST* nav_get_title_list(const char *root, uint32_t flags)
+NAV_TITLE_LIST* nav_get_title_list(const char *root, uint32_t flags, uint32_t min_title_length)
 {
     BD_DIR_H *dir;
     BD_DIRENT ent;
@@ -171,6 +171,11 @@
                 mpls_free(pl);
                 continue;
             }
+            if (min_title_length > 0 &&
+                _pl_duration(pl) < min_title_length*45000) {
+                mpls_free(pl);
+                continue;
+            }
             if (ii >= title_info_alloc) {
                 NAV_TITLE_INFO *tmp = NULL;
                 title_info_alloc += 100;
@@ -197,6 +202,7 @@
     for (ii = 0; ii < title_list->count; ii++) {
         mpls_free(pl_list[ii]);
     }
+    X_FREE(pl_list);
     return title_list;
 }
 
@@ -271,9 +277,7 @@
         mpls_free(pl_list[ii]);
     }
     if (count > 0) {
-        char *str = (char*)malloc(strlen(longest) + 1);
-        strcpy(str, longest);
-        return str;
+        return strdup(longest);
     } else {
         return NULL;
     }
@@ -429,8 +433,12 @@
             clip->connection = CONNECT_SEAMLESS;
             break;
         default:
-            clip->start_pkt = clpi_lookup_spn(clip->cl, in_time, 1,
+            if (ref) {
+                clip->start_pkt = clpi_lookup_spn(clip->cl, in_time, 1,
                                               mpls_clip[clip->angle].stc_id);
+            } else {
+                clip->start_pkt = 0;
+            }
             clip->connection = CONNECT_NON_SEAMLESS;
             break;
     }
@@ -456,8 +464,7 @@
     if (title == NULL) {
         return NULL;
     }
-    title->root = (char*)malloc(strlen(root) + 1);
-    strcpy(title->root, root);
+    title->root = strdup(root);
     strncpy(title->name, playlist, 11);
     title->name[10] = '\0';
     path = str_printf("%s" DIR_SEP "BDMV" DIR_SEP "PLAYLIST" DIR_SEP "%s",

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/navigation.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/navigation.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bdnav/sound_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bdnav/sound_parse.h Changed

libbluray-0.2.3.tar.bz2/src/libbluray/bluray-version.h Added

@@ -0,0 +1,37 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2011 hpi1
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BLURAY_VERSION_H_
+#define BLURAY_VERSION_H_
+
+#define BLURAY_VERSION_CODE(major, minor, micro) \
+    (((major) * 10000) +                         \
+     ((minor) *   100) +                         \
+     ((micro) *     1))
+
+#define BLURAY_VERSION_MAJOR 0
+#define BLURAY_VERSION_MINOR 2
+#define BLURAY_VERSION_MICRO 3
+
+#define BLURAY_VERSION_STRING "0.2.3"
+
+#define BLURAY_VERSION \
+    BLURAY_VERSION_CODE(BLURAY_VERSION_MAJOR, BLURAY_VERSION_MINOR, BLURAY_VERSION_MICRO)
+
+#endif /* BLURAY_VERSION_H_ */

libbluray-0.2.3.tar.bz2/src/libbluray/bluray-version.h.in Added

@@ -0,0 +1,37 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2011 hpi1
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BLURAY_VERSION_H_
+#define BLURAY_VERSION_H_
+
+#define BLURAY_VERSION_CODE(major, minor, micro) \
+    (((major) * 10000) +                         \
+     ((minor) *   100) +                         \
+     ((micro) *     1))
+
+#define BLURAY_VERSION_MAJOR @BLURAY_VERSION_MAJOR@
+#define BLURAY_VERSION_MINOR @BLURAY_VERSION_MINOR@
+#define BLURAY_VERSION_MICRO @BLURAY_VERSION_MICRO@
+
+#define BLURAY_VERSION_STRING "@BLURAY_VERSION_MAJOR@.@BLURAY_VERSION_MINOR@.@BLURAY_VERSION_MICRO@"
+
+#define BLURAY_VERSION \
+    BLURAY_VERSION_CODE(BLURAY_VERSION_MAJOR, BLURAY_VERSION_MINOR, BLURAY_VERSION_MICRO)
+
+#endif /* BLURAY_VERSION_H_ */

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bluray.c -> libbluray-0.2.3.tar.bz2/src/libbluray/bluray.c Changed

@@ -23,39 +23,50 @@
 #include "config.h"
 #endif
 
+#include "bluray-version.h"
 #include "bluray.h"
 #include "register.h"
 #include "util/macro.h"
 #include "util/logging.h"
 #include "util/strutl.h"
+#include "util/mutex.h"
 #include "bdnav/navigation.h"
 #include "bdnav/index_parse.h"
 #include "bdnav/meta_parse.h"
 #include "bdnav/clpi_parse.h"
+#include "bdnav/sound_parse.h"
 #include "hdmv/hdmv_vm.h"
 #include "decoders/graphics_controller.h"
 #include "file/file.h"
-#ifdef DLOPEN_CRYPTO_LIBS
 #include "file/dl.h"
-#endif
 #ifdef USING_BDJAVA
 #include "bdj/bdj.h"
 #endif
 
-#ifndef DLOPEN_CRYPTO_LIBS
-#include <libaacs/aacs.h>
-#include <libbdplus/bdplus.h>
-#endif
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
 
+#ifdef HAVE_MNTENT_H
+#include <sys/stat.h>
+#include <mntent.h>
+#endif
+
+#ifdef __APPLE__
+#define _DARWIN_C_SOURCE
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+#endif
+
 typedef int     (*fptr_int)();
 typedef int32_t (*fptr_int32)();
 typedef void*   (*fptr_p_void)();
 
 #define MAX_EVENTS 31  /* 2^n - 1 */
 typedef struct bd_event_queue_s {
+    BD_MUTEX mutex;
     unsigned in;  /* next free slot */
     unsigned out; /* next event */
     BD_EVENT ev[MAX_EVENTS+1];
@@ -105,6 +116,7 @@
     /* streams */
     BD_STREAM      st0; /* main path */
     BD_PRELOAD     st_ig; /* preloaded IG stream sub path */
+    int            ig_pid; /* pid of currently selected IG stream in main path */
 
     /* buffer for bd_read(): current aligned unit of main stream (st0) */
     uint8_t        int_buf[6144];
@@ -119,17 +131,13 @@
     uint64_t       next_chapter_start;
 
     /* aacs */
-#ifdef DLOPEN_CRYPTO_LIBS
     void           *h_libaacs;   // library handle
-#endif
     void           *aacs;
     fptr_p_void    libaacs_open;
     fptr_int       libaacs_decrypt_unit;
 
     /* BD+ */
-#ifdef DLOPEN_CRYPTO_LIBS
     void           *h_libbdplus; // library handle
-#endif
     void           *bdplus;
     fptr_p_void    bdplus_init;
     fptr_int32     bdplus_seek;
@@ -147,20 +155,27 @@
 
     /* graphics */
     GRAPHICS_CONTROLLER *graphics_controller;
+    SOUND_DATA          *sound_effects;
+    uint32_t             gc_status;
 };
 
-#ifdef DLOPEN_CRYPTO_LIBS
-#    define DL_CALL(lib,func,param,...)             \
+#define DL_CALL(lib,func,param,...)             \
      do {                                           \
           fptr_p_void fptr = (fptr_p_void)dl_dlsym(lib, #func);  \
           if (fptr) {                               \
               fptr(param, ##__VA_ARGS__);           \
           }                                         \
       } while (0)
-#else
-#    define DL_CALL(lib,func,param,...)         \
-     func (param, ##__VA_ARGS__)
-#endif
+
+/*
+ * Library version
+ */
+void bd_get_version(int *major, int *minor, int *micro)
+{
+    *major = BLURAY_VERSION_MAJOR;
+    *minor = BLURAY_VERSION_MINOR;
+    *micro = BLURAY_VERSION_MICRO;
+}
 
 /*
  * Navigation mode event queue
@@ -170,8 +185,21 @@
 {
     if (!bd->event_queue) {
         bd->event_queue = calloc(1, sizeof(struct bd_event_queue_s));
+        bd_mutex_init(&bd->event_queue->mutex);
     } else {
-        memset(bd->event_queue, 0, sizeof(struct bd_event_queue_s));
+        bd_mutex_lock(&bd->event_queue->mutex);
+        bd->event_queue->in  = 0;
+        bd->event_queue->out = 0;
+        memset(bd->event_queue->ev, 0, sizeof(bd->event_queue->ev));
+        bd_mutex_unlock(&bd->event_queue->mutex);
+    }
+}
+
+static void _free_event_queue(BLURAY *bd)
+{
+    if (bd->event_queue) {
+        bd_mutex_destroy(&bd->event_queue->mutex);
+        X_FREE(bd->event_queue);
     }
 }
 
@@ -180,11 +208,18 @@
     struct bd_event_queue_s *eq = bd->event_queue;
 
     if (eq) {
+        bd_mutex_lock(&eq->mutex);
+
         if (eq->in != eq->out) {
+
             *ev = eq->ev[eq->out];
             eq->out = (eq->out + 1) & MAX_EVENTS;
+
+            bd_mutex_unlock(&eq->mutex);
             return 1;
         }
+
+        bd_mutex_unlock(&eq->mutex);
     }
 
     ev->event = BD_EVENT_NONE;
@@ -197,14 +232,20 @@
     struct bd_event_queue_s *eq = bd->event_queue;
 
     if (eq) {
+        bd_mutex_lock(&eq->mutex);
+
         unsigned new_in = (eq->in + 1) & MAX_EVENTS;
 
         if (new_in != eq->out) {
             eq->ev[eq->in] = ev;
             eq->in = new_in;
+
+            bd_mutex_unlock(&eq->mutex);
             return 1;
         }
 
+        bd_mutex_unlock(&eq->mutex);
+
         BD_DEBUG(DBG_BLURAY|DBG_CRIT, "_queue_event(%d, %d): queue overflow !\n", ev.event, ev.param);
     }
 
@@ -217,8 +258,9 @@
 
 static void _update_stream_psr_by_lang(BD_REGISTERS *regs,
                                        uint32_t psr_lang, uint32_t psr_stream,
-                                       uint32_t enable_flag, uint32_t undefined_val,
-                                       MPLS_STREAM *streams, unsigned num_streams)
+                                       uint32_t enable_flag,
+                                       MPLS_STREAM *streams, unsigned num_streams,
+                                       uint32_t *lang, uint32_t blacklist)
 {
     uint32_t psr_val;
     int      stream_idx = -1;
@@ -242,13 +284,21 @@
 
     if (stream_idx < 0) {
         /* requested language not found */
-        stream_idx = undefined_val - 1;
+        stream_idx = 0;
         enable_flag = 0;
+

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/bluray.h -> libbluray-0.2.3.tar.bz2/src/libbluray/bluray.h Changed

@@ -44,22 +44,24 @@
 typedef struct bluray BLURAY;
 
 typedef enum {
-    BLURAY_STREAM_TYPE_VIDEO_MPEG1        = 0x01,
-    BLURAY_STREAM_TYPE_VIDEO_MPEG2        = 0x02,
-    BLURAY_STREAM_TYPE_AUDIO_MPEG1        = 0x03,
-    BLURAY_STREAM_TYPE_AUDIO_MPEG2        = 0x04,
-    BLURAY_STREAM_TYPE_AUDIO_LPCM         = 0x80,
-    BLURAY_STREAM_TYPE_AUDIO_AC3          = 0x81,
-    BLURAY_STREAM_TYPE_AUDIO_DTS          = 0x82,
-    BLURAY_STREAM_TYPE_AUDIO_TRUHD        = 0x83,
-    BLURAY_STREAM_TYPE_AUDIO_AC3PLUS      = 0x84,
-    BLURAY_STREAM_TYPE_AUDIO_DTSHD        = 0x85,
-    BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER = 0x86,
-    BLURAY_STREAM_TYPE_VIDEO_VC1          = 0xea,
-    BLURAY_STREAM_TYPE_VIDEO_H264         = 0x1b,
-    BLURAY_STREAM_TYPE_SUB_PG             = 0x90,
-    BLURAY_STREAM_TYPE_SUB_IG             = 0x91,
-    BLURAY_STREAM_TYPE_SUB_TEXT           = 0x92
+    BLURAY_STREAM_TYPE_VIDEO_MPEG1              = 0x01,
+    BLURAY_STREAM_TYPE_VIDEO_MPEG2              = 0x02,
+    BLURAY_STREAM_TYPE_AUDIO_MPEG1              = 0x03,
+    BLURAY_STREAM_TYPE_AUDIO_MPEG2              = 0x04,
+    BLURAY_STREAM_TYPE_AUDIO_LPCM               = 0x80,
+    BLURAY_STREAM_TYPE_AUDIO_AC3                = 0x81,
+    BLURAY_STREAM_TYPE_AUDIO_DTS                = 0x82,
+    BLURAY_STREAM_TYPE_AUDIO_TRUHD              = 0x83,
+    BLURAY_STREAM_TYPE_AUDIO_AC3PLUS            = 0x84,
+    BLURAY_STREAM_TYPE_AUDIO_DTSHD              = 0x85,
+    BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER       = 0x86,
+    BLURAY_STREAM_TYPE_VIDEO_VC1                = 0xea,
+    BLURAY_STREAM_TYPE_VIDEO_H264               = 0x1b,
+    BLURAY_STREAM_TYPE_SUB_PG                   = 0x90,
+    BLURAY_STREAM_TYPE_SUB_IG                   = 0x91,
+    BLURAY_STREAM_TYPE_SUB_TEXT                 = 0x92,
+    BLURAY_STREAM_TYPE_AUDIO_AC3PLUS_SECONDARY  = 0xa1,
+    BLURAY_STREAM_TYPE_AUDIO_DTSHD_SECONDARY    = 0xa2
 } bd_stream_type_e;
 
 typedef enum {
@@ -166,6 +168,18 @@
     BLURAY_TITLE_CHAPTER *chapters;
 } BLURAY_TITLE_INFO;
 
+typedef struct bd_sound_effect {
+    uint8_t         num_channels; /* 1 - mono, 2 - stereo */
+    uint32_t        num_frames;
+    const int16_t  *samples;      /* 48000 Hz, 16 bit LPCM. interleaved if stereo */
+} BLURAY_SOUND_EFFECT;
+
+/**
+ *  Get library version
+ *
+ */
+void bd_get_version(int *major, int *minor, int *micro);
+
 /**
  *
  *  This must be called after bd_open() and before bd_select_title().
@@ -174,9 +188,10 @@
  *
  * @param bd  BLURAY object
  * @param flags  title flags
+ * @param min_title_length  filter out titles shorter than min_title_length seconds
  * @return number of titles found
  */
-uint32_t bd_get_titles(BLURAY *bd, uint8_t flags);
+uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length);
 
 /**
  *
@@ -184,9 +199,10 @@
  *
  * @param bd  BLURAY object
  * @param title_idx title index number
+ * @param angle angle number (chapter offsets and clip size depend on selected angle)
  * @return allocated BLURAY_TITLE_INFO object, NULL on error
  */
-BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx);
+BLURAY_TITLE_INFO* bd_get_title_info(BLURAY *bd, uint32_t title_idx, unsigned angle);
 
 /**
  *
@@ -194,9 +210,10 @@
  *
  * @param bd  BLURAY object
  * @param playlist playlist number
+ * @param angle angle number (chapter offsets and clip size depend on selected angle)
  * @return allocated BLURAY_TITLE_INFO object, NULL on error
  */
-BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist);
+BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle);
 
 /**
  *
@@ -209,7 +226,7 @@
 /**
  *  Initializes libbluray objects
  *
- * @param device_path   path to mounted Blu-ray disc
+ * @param device_path   path to mounted Blu-ray disc or device
  * @param keyfile_path  path to KEYDB.cfg (may be NULL)
  * @return allocated BLURAY object, NULL if error
  */
@@ -248,7 +265,7 @@
  * @param bd  BLURAY object
  * @param buf buffer to read data into
  * @param len size of data to be read
- * @return size of data read, -1 if error
+ * @return size of data read, -1 if error, 0 if EOF
  */
 int bd_read(BLURAY *bd, unsigned char *buf, int len);
 
@@ -390,6 +407,14 @@
  * Disc info
  */
 
+/* AACS error codes */
+#define BD_AACS_CORRUPTED_DISC  -1
+#define BD_AACS_NO_CONFIG       -2
+#define BD_AACS_NO_PK           -3
+#define BD_AACS_NO_CERT         -4
+#define BD_AACS_CERT_REVOKED    -5
+#define BD_AACS_MMC_FAILED      -6
+
 typedef struct {
     uint8_t  bluray_detected;
 
@@ -408,6 +433,14 @@
     uint8_t  libbdplus_detected;
     uint8_t  bdplus_handled;
 
+    /* aacs error code */
+    int      aacs_error_code;
+    /* aacs MKB version */
+    int      aacs_mkbv;
+
+    /* Disc ID */
+    uint8_t  disc_id[20];
+
 } BLURAY_DISC_INFO;
 
 /**
@@ -461,14 +494,15 @@
 
 typedef enum {
     BD_EVENT_NONE = 0,
-    BD_EVENT_ERROR,
-    BD_EVENT_ENCRYPTED,
+    BD_EVENT_ERROR,       /* Fatal error. Playback can't be continued. */
+    BD_EVENT_READ_ERROR,  /* Reading of .m2ts aligned unit failed. Next call to read will try next block. */
+    BD_EVENT_ENCRYPTED,   /* .m2ts file is encrypted and can't be played */
 
     /* current playback position */
     BD_EVENT_ANGLE,     /* current angle, 1...N */
     BD_EVENT_TITLE,     /* current title, 1...N (0 = top menu) */
     BD_EVENT_PLAYLIST,  /* current playlist (xxxxx.mpls) */
-    BD_EVENT_PLAYITEM,  /* current play item */
+    BD_EVENT_PLAYITEM,  /* current play item, 0...N-1  */
     BD_EVENT_CHAPTER,   /* current chapter, 1...N */
     BD_EVENT_END_OF_TITLE,
 
@@ -495,6 +529,14 @@
     /* Still playback for n seconds (reached end of still mode play item) */
     BD_EVENT_STILL_TIME,             /* 0 = infinite ; 1...300 = seconds */
 
+    /* Play sound effect */
+    BD_EVENT_SOUND_EFFECT,           /* effect ID */
+
+    /* Pop-Up menu available */
+    BD_EVENT_POPUP,                  /* 0 - no, 1 - yes */
+
+    /* Interactive menu visible */
+    BD_EVENT_MENU,                   /* 0 - no, 1 - yes */
 } bd_event_e;
 
 typedef struct {
@@ -509,7 +551,7 @@
  *  Get event from libbluray event queue.
  *
  * @param bd  BLURAY object
- * @param event next BD_EVENT from event queue
+ * @param event next BD_EVENT from event queue, NULL to initialize event queue
  * @return 1 on success, 0 if no events
  */
 int  bd_get_event(BLURAY *bd, BD_EVENT *event);
@@ -520,7 +562,7 @@
 
 /**
  *
- *  Start playing disc in navigation mode.
+ *  Start playing disc in navigation mode (using on-disc menus).
  *
  *  Playback is started from "First Play" title.
  *
@@ -596,9 +638,9 @@
  * @param bd  BLURAY object
  * @param pts current playback position (1/90000s) or -1
  * @param key input key

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/graphics_controller.c -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_controller.c Changed

@@ -43,6 +43,8 @@
 typedef struct {
     uint16_t enabled_button;  /* enabled button id */
     uint16_t x, y, w, h;      /* button rect on overlay plane (if drawn) */
+    int      visible_object_id; /* id of currently visible object */
+    int      animate_indx;    /* currently showing object index of animated button, < 0 for static buttons */
 } BOG_DATA;
 
 struct graphics_controller_s {
@@ -56,11 +58,17 @@
     void          (*overlay_proc)(void *, const struct bd_overlay_s * const);
 
     /* state */
+    unsigned        ig_open;
     unsigned        ig_drawn;
+    unsigned        ig_dirty;
+    unsigned        pg_open;
     unsigned        pg_drawn;
+    unsigned        pg_dirty;
     unsigned        popup_visible;
     unsigned        valid_mouse_position;
+    unsigned        auto_action_triggered;
     BOG_DATA       *bog_data;
+    BOG_DATA       *saved_bog_data;
 
     /* data */
     PG_DISPLAY_SET *pgs;
@@ -147,23 +155,57 @@
 enum { BTN_NORMAL, BTN_SELECTED, BTN_ACTIVATED };
 
 static BD_PG_OBJECT *_find_object_for_button(PG_DISPLAY_SET *s,
-                                             BD_IG_BUTTON *button, int state)
+                                             BD_IG_BUTTON *button, int state,
+                                             BOG_DATA *bog_data)
 {
     BD_PG_OBJECT *object   = NULL;
     unsigned object_id     = 0xffff;
+    unsigned object_id_end = 0xffff;
+    unsigned repeat        = 0;
 
     switch (state) {
         case BTN_NORMAL:
-            object_id = button->normal_start_object_id_ref;
+            object_id     = button->normal_start_object_id_ref;
+            object_id_end = button->normal_end_object_id_ref;
+            repeat        = button->normal_repeat_flag;
             break;
         case BTN_SELECTED:
-            object_id = button->selected_start_object_id_ref;
+            object_id     = button->selected_start_object_id_ref;
+            object_id_end = button->selected_end_object_id_ref;
+            repeat        = button->selected_repeat_flag;
             break;
         case BTN_ACTIVATED:
-            object_id = button->activated_start_object_id_ref;
+            object_id     = button->activated_start_object_id_ref;
+            object_id_end = button->activated_end_object_id_ref;
             break;
     }
 
+    if (bog_data) {
+        if (bog_data->animate_indx >= 0) {
+            int range = object_id_end - object_id;
+
+            if (range > 0 && object_id < 0xffff && object_id_end < 0xffff) {
+                GC_TRACE("animate button #%d: animate_indx %d, range %d, repeat %d\n",
+                         button->id, bog_data->animate_indx, range, repeat);
+
+                object_id += bog_data->animate_indx % (range + 1);
+                bog_data->animate_indx++;
+                if (!repeat && bog_data->animate_indx > range) {
+                /* terminate animation to the last object */
+                    bog_data->animate_indx = -1;
+                }
+
+            } else {
+                /* no animation for this button */
+                bog_data->animate_indx = -1;
+            }
+        }
+    }
+
+    if (!repeat && object_id_end < 0xfffe) {
+        object_id = object_id_end;
+    }
+
     object = _find_object(s, object_id);
 
     return object;
@@ -173,6 +215,14 @@
  * util
  */
 
+static int _areas_overlap(BOG_DATA *a, BOG_DATA *b)
+{
+    return !(a->x + a->w <= b->x        ||
+             a->x        >= b->x + b->w ||
+             a->y + a->h <= b->y        ||
+             a->y        >= b->y + b->h);
+}
+
 static int _is_button_enabled(GRAPHICS_CONTROLLER *gc, BD_IG_PAGE *page, unsigned button_id)
 {
     unsigned ii;
@@ -238,6 +288,53 @@
     return 0xffff;
 }
 
+static int _save_page_state(GRAPHICS_CONTROLLER *gc)
+{
+    if (!gc->bog_data) {
+        GC_ERROR("_save_page_state(): no bog data !\n");
+        return -1;
+    }
+
+    PG_DISPLAY_SET *s       = gc->igs;
+    BD_IG_PAGE     *page    = NULL;
+    unsigned        page_id = bd_psr_read(gc->regs, PSR_MENU_PAGE_ID);
+    unsigned        ii;
+
+    page = _find_page(&s->ics->interactive_composition, page_id);
+    if (!page) {
+        GC_ERROR("_save_page_state(): unknown page #%d (have %d pages)\n",
+              page_id, s->ics->interactive_composition.num_pages);
+        return -1;
+    }
+
+    /* copy enabled button state, clear draw state */
+
+    X_FREE(gc->saved_bog_data);
+    gc->saved_bog_data = calloc(page->num_bogs, sizeof(*gc->saved_bog_data));
+
+    for (ii = 0; ii < page->num_bogs; ii++) {
+        gc->saved_bog_data[ii].enabled_button = gc->bog_data[ii].enabled_button;
+        gc->saved_bog_data[ii].animate_indx   = gc->bog_data[ii].animate_indx >= 0 ? 0 : -1;
+    }
+
+    return 1;
+}
+
+static int _restore_page_state(GRAPHICS_CONTROLLER *gc)
+{
+    if (gc->saved_bog_data) {
+        if (gc->bog_data) {
+            GC_ERROR("_restore_page_state(): bog data already exists !\n");
+            X_FREE(gc->bog_data);
+        }
+        gc->bog_data       = gc->saved_bog_data;
+        gc->saved_bog_data = NULL;
+
+        return 1;
+    }
+    return -1;
+}
+
 static void _reset_page_state(GRAPHICS_CONTROLLER *gc)
 {
     PG_DISPLAY_SET *s       = gc->igs;
@@ -259,6 +356,68 @@
 
     for (ii = 0; ii < page->num_bogs; ii++) {
         gc->bog_data[ii].enabled_button = page->bog[ii].default_valid_button_id_ref;
+        gc->bog_data[ii].animate_indx   = 0;
+        gc->bog_data[ii].visible_object_id = -1;
+    }
+}
+
+/*
+ * overlay operations
+ */
+
+static void _open_osd(GRAPHICS_CONTROLLER *gc, int plane,
+                      unsigned width, unsigned height)
+{
+    if (gc->overlay_proc) {
+        const BD_OVERLAY ov = {
+            .cmd     = BD_OVERLAY_INIT,
+            .pts     = -1,
+            .plane   = plane,
+            .w       = width,
+            .h       = height,
+        };
+
+        gc->overlay_proc(gc->overlay_proc_handle, &ov);
+
+        if (plane == BD_OVERLAY_IG) {
+            gc->ig_open = 1;
+        } else {
+            gc->pg_open = 1;
+        }
+    }
+}
+
+static void _close_osd(GRAPHICS_CONTROLLER *gc, int plane)
+{
+    if (gc->overlay_proc) {
+        const BD_OVERLAY ov = {
+            .cmd     = BD_OVERLAY_CLOSE,
+            .pts     = -1,
+            .plane   = plane,

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/graphics_controller.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_controller.h Changed

@@ -41,6 +41,7 @@
 
 typedef enum {
     /* */
+    GC_CTRL_INIT_MENU,       /* */
     GC_CTRL_NOP,             /* No input. Render page / run timers / run animations */
     GC_CTRL_RESET,           /* reset graphics controller */
 
@@ -57,6 +58,11 @@
 
 } gc_ctrl_e;
 
+
+#define GC_STATUS_NONE      0
+#define GC_STATUS_POPUP     1  /* popup menu loaded */
+#define GC_STATUS_MENU_OPEN 2  /* menu open */
+
 typedef struct {
     /* HDMV navigation command sequence */
     int   num_nav_cmds;
@@ -64,6 +70,9 @@
 
     /* Sound idx */
     int   sound_id_ref;
+
+    /* graphics status (none, menu, popup) */
+    uint32_t status; /* bit mask */
 } GC_NAV_CMDS;
 
 /*
@@ -75,11 +84,18 @@
 
 BD_PRIVATE void                 gc_free(GRAPHICS_CONTROLLER **p);
 
-/*
- * input stream (MPEG-TS IG stream)
+/**
+ *
+ *  Decode data from MPEG-TS input stream
+ *
+ * @param p  GRAPHICS_CONTROLLER object
+ * @param pid  mpeg-ts PID to decode (HDMV IG/PG stream)
+ * @param block  mpeg-ts data
+ * @param num_blocks  number of aligned units in data
+ * @param stc  current playback time
+ * @return <0 on error, 0 when not complete, >0 when complete
  */
-
-BD_PRIVATE void                 gc_decode_ts(GRAPHICS_CONTROLLER *p,
+BD_PRIVATE int                  gc_decode_ts(GRAPHICS_CONTROLLER *p,
                                              uint16_t pid,
                                              uint8_t *block, unsigned num_blocks,
                                              int64_t stc);

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/graphics_processor.c -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_processor.c Changed

@@ -358,9 +358,7 @@
         *s = calloc(1, sizeof(PG_DISPLAY_SET));
     }
 
-    (*s)->complete = 0;
-
-    while (*p && !(*s)->complete) {
+    while (*p) {
 
         /* time to decode next segment ? */
         if (stc >= 0 && (*p)->dts > stc) {
@@ -375,18 +373,30 @@
             return 0;
         }
 
+        if ((*p)->len <= 2) {
+            BD_DEBUG(DBG_DECODE, "segment too short, skipping (%d bytes)\n", (*p)->len);
+            pes_buffer_remove(p, *p);
+            continue;
+        }
+
+        /* decode segment */
+
         GP_TRACE("Decoding segment, dts %010"PRId64" pts %010"PRId64" len %d\n",
                  (*p)->dts, (*p)->pts, (*p)->len);
 
-        /* decode segment */
-        if ((*p)->len > 2) {
-            _decode_segment(*s, *p);
-        }
+        (*s)->complete = 0;
+
+        _decode_segment(*s, *p);
 
         pes_buffer_remove(p, *p);
+
+        if ((*s)->complete) {
+            return 1;
+        }
+
     }
 
-    return (*s)->complete;
+    return 0;
 }
 
 /*
@@ -437,5 +447,9 @@
         unit += 6144;
     }
 
-    return graphics_processor_decode_pes(s, &p->queue, stc);
+    if (p->queue) {
+        return graphics_processor_decode_pes(s, &p->queue, stc);
+    }
+
+    return 0;
 }

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/graphics_processor.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/graphics_processor.h Changed

@@ -61,23 +61,40 @@
 BD_PRIVATE GRAPHICS_PROCESSOR *graphics_processor_init(void);
 BD_PRIVATE void                graphics_processor_free(GRAPHICS_PROCESSOR **p);
 
-/*
- *  stc:      current STC
+/**
  *
- *  return:   0 : wait for more data
- *            1 : display set complete
+ *  Decode data from MPEG-PES input stream
  *
  *  Only segments where DTS <= STC are decoded.
  *  If STC < 0, all segments are immediately decoded to display set.
  *
  *  All decoded PES packets are removed from buffer.
+ *
+ * @param s  display set
+ * @param buf  data to decode
+ * @param stc  current playback time
+ * @return 1 if display set was completed, 0 otherwise
  */
-
 BD_PRIVATE int
 graphics_processor_decode_pes(PG_DISPLAY_SET **s,
                               struct pes_buffer_s **buf,
                               int64_t stc);
 
+/**
+ *
+ *  Decode data from MPEG-TS input stream
+ *
+ *  Segments are queued and decoded when DTS <= STC.
+ *  If STC < 0, all segments are immediately decoded to display set.
+ *
+ * @param p  GRAPHICS_PROCESSOR object
+ * @param s  display set
+ * @param pid  mpeg-ts PID to decode (HDMV IG/PG stream)
+ * @param unit  mpeg-ts data
+ * @param num_units  number of aligned units in data
+ * @param stc  current playback time
+ * @return 1 if display set was completed, 0 otherwise
+ */
 BD_PRIVATE int
 graphics_processor_decode_ts(GRAPHICS_PROCESSOR *p,
                              PG_DISPLAY_SET **s,

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/overlay.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/overlay.h Changed

@@ -22,6 +22,22 @@
 
 #include <stdint.h>
 
+#define BD_OVERLAY_INTERFACE_VERSION 2
+
+typedef enum {
+    BD_OVERLAY_PG = 0,  /* Presentation Graphics plane */
+    BD_OVERLAY_IG = 1,  /* Interactive Graphics plane (on top of PG plane) */
+} bd_overlay_plane_e;
+
+typedef enum {
+    BD_OVERLAY_INIT,    /* init overlay plane. Size of full plane in x,y,w,h */
+    BD_OVERLAY_CLEAR,   /* clear plane */
+    BD_OVERLAY_DRAW,    /* draw bitmap (x,y,w,h,img,palette) */
+    BD_OVERLAY_WIPE,    /* clear area (x,y,w,h) */
+    BD_OVERLAY_FLUSH,   /* all changes have been done, flush overlay to display at given pts */
+    BD_OVERLAY_CLOSE,   /* close overlay */
+} bd_overlay_cmd_e;
+
 typedef struct bd_pg_palette_entry_s {
     uint8_t Y;
     uint8_t Cr;
@@ -36,7 +52,8 @@
 
 typedef struct bd_overlay_s {
     int64_t  pts;
-    uint8_t  plane; /* 0 - PG, 1 - IG */
+    uint8_t  plane; /* bd_overlay_plane_e */
+    uint8_t  cmd;   /* bd_overlay_cmd_e */
 
     uint16_t x;
     uint16_t y;
@@ -45,6 +62,7 @@
 
     const BD_PG_PALETTE_ENTRY * palette;
     const BD_PG_RLE_ELEM      * img;
+
 } BD_OVERLAY;

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/pg.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pg.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/pg_decode.c -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pg_decode.c Changed

@@ -112,7 +112,15 @@
     int num_rle     = 0;
     int rle_size    = p->width * p->height / 4;
 
+    if (rle_size < 1)
+        rle_size = 1;
+
     p->img = realloc(p->img, rle_size * sizeof(BD_PG_RLE_ELEM));
+    if (!p->img) {
+        BD_DEBUG(DBG_DECODE | DBG_CRIT, "pg_decode_object(): relloc(%zu) failed\n",
+                 rle_size * sizeof(BD_PG_RLE_ELEM));
+        return 0;
+    }
 
     while (!bb_eof(bb)) {
         uint32_t len   = 1;
@@ -140,10 +148,22 @@
 
         pixels_left -= len;
 
+        if (pixels_left < 0) {
+            BD_DEBUG(DBG_DECODE, "pg_decode_object(): too many pixels (%d)\n", -pixels_left);
+            return 0;
+        }
+
         num_rle++;
         if (num_rle >= rle_size) {
+            void *tmp = p->img;
             rle_size *= 2;
             p->img = realloc(p->img, rle_size * sizeof(BD_PG_RLE_ELEM));
+            if (!p->img) {
+                BD_DEBUG(DBG_DECODE | DBG_CRIT, "pg_decode_object(): relloc(%zu) failed\n",
+                         rle_size * sizeof(BD_PG_RLE_ELEM));
+                X_FREE(tmp);
+                return 0;
+            }
         }
     }
 
@@ -151,10 +171,6 @@
         BD_DEBUG(DBG_DECODE, "pg_decode_object(): missing %d pixels\n", pixels_left);
         return 0;
     }
-    if (pixels_left < 0) {
-        BD_DEBUG(DBG_DECODE, "pg_decode_object(): too many pixels (%d)\n", -pixels_left);
-        return 0;
-    }
 
     return 1;
 }
@@ -218,6 +234,20 @@
     return 1;
 }
 
+int pg_decode_windows(BITBUFFER *bb, BD_PG_WINDOWS *p)
+{
+    unsigned ii;
+
+    p->num_windows = bb_read(bb, 8);
+    p->window = calloc(p->num_windows, sizeof(BD_PG_WINDOW));
+
+    for (ii = 0; ii < p->num_windows; ii++) {
+        pg_decode_window(bb, &p->window[ii]);
+    }
+
+    return 1;
+}
+
 /*
  * cleanup
  */
@@ -236,10 +266,10 @@
     }
 }
 
-void pg_free_window(BD_PG_WINDOW **p)
+void pg_clean_windows(BD_PG_WINDOWS *p)
 {
-    if (p && *p) {
-        X_FREE(*p);
+    if (p) {
+        X_FREE(p->window);
     }
 }
 
@@ -265,3 +295,11 @@
         X_FREE(*p);
     }
 }
+
+void pg_free_windows(BD_PG_WINDOWS **p)
+{
+    if (p && *p) {
+        pg_clean_windows(*p);
+        X_FREE(*p);
+    }
+}

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/decoders/pg_decode.h -> libbluray-0.2.3.tar.bz2/src/libbluray/decoders/pg_decode.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/hdmv/hdmv_vm.c -> libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/hdmv_vm.c Changed

@@ -56,6 +56,10 @@
     MOBJ_OBJECTS  *movie_objects; /* disc movie objects */
     MOBJ_OBJECT   *ig_object;     /* current object from IG stream */
 
+    /* object currently playing playlist */
+    MOBJ_OBJECT *playing_object;
+    int          playing_pc;
+
     /* suspended object */
     MOBJ_OBJECT *suspended_object;
     int          suspended_pc;
@@ -299,6 +303,38 @@
     return play_pl;
 }
 
+static int _suspend_for_play_pl(HDMV_VM *p)
+{
+    if (p->playing_object) {
+        BD_DEBUG(DBG_HDMV|DBG_CRIT, "_suspend_for_play_pl(): object already playing playlist !\n");
+        return -1;
+    }
+
+    p->playing_object = p->object;
+    p->playing_pc     = p->pc;
+
+    p->object = NULL;
+
+    return 0;
+}
+
+static int _resume_from_play_pl(HDMV_VM *p)
+{
+    if (!p->playing_object) {
+        BD_DEBUG(DBG_HDMV|DBG_CRIT, "_resume_from_play_pl(): object not playing playlist !\n");
+        return -1;
+    }
+
+    p->object = p->playing_object;
+    p->pc     = p->playing_pc + 1;
+
+    p->playing_object = NULL;
+
+    _free_ig_object(p);
+
+    return 0;
+}
+
 static void _suspend_object(HDMV_VM *p, int psr_backup)
 {
     BD_DEBUG(DBG_HDMV, "_suspend_object()\n");
@@ -312,10 +348,31 @@
         bd_psr_save_state(p->regs);
     }
 
-    p->suspended_object = p->object;
-    p->suspended_pc     = p->pc;
+    if (p->ig_object) {
+        if (!p->playing_object) {
+            BD_DEBUG(DBG_HDMV|DBG_CRIT, "_suspend_object: IG object tries to suspend, no playing object !\n");
+            return;
+        }
+        p->suspended_object = p->playing_object;
+        p->suspended_pc     = p->playing_pc;
+
+        p->playing_object = NULL;
+
+    } else {
+
+        if (p->playing_object) {
+            BD_DEBUG(DBG_HDMV|DBG_CRIT, "_suspend_object: Movie object tries to suspend, also playing object present !\n");
+            return;
+        }
+
+        p->suspended_object = p->object;
+        p->suspended_pc     = p->pc;
+
+    }
 
     p->object = NULL;
+
+    _free_ig_object(p);
 }
 
 static int _resume_object(HDMV_VM *p, int psr_restore)
@@ -325,19 +382,33 @@
         return -1;
     }
 
+    p->object = NULL;
+    p->playing_object = NULL;
     _free_ig_object(p);
 
-    p->object = p->suspended_object;
-    p->pc     = p->suspended_pc + 1;
-
     if (psr_restore) {
+        /* check if suspended in play_pl */
+        if (_suspended_at_play_pl(p)) {
+            BD_DEBUG(DBG_HDMV, "resuming playlist playback\n");
+            p->playing_object = p->suspended_object;
+            p->playing_pc     = p->suspended_pc;
+            p->suspended_object = NULL;
+            bd_psr_restore_state(p->regs);
+
+            return 0;
+        }
         bd_psr_restore_state(p->regs);
     }
 
-    BD_DEBUG(DBG_HDMV, "resuming object %p at %d\n", p->object, p->pc + 1);
+    p->object = p->suspended_object;
+    p->pc     = p->suspended_pc + 1;
 
     p->suspended_object = NULL;
 
+    BD_DEBUG(DBG_HDMV, "resuming object %p at %d\n", p->object, p->pc);
+
+    _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
+
     return 0;
 }
 
@@ -370,8 +441,12 @@
 
     BD_DEBUG(DBG_HDMV, "_jump_object(): jumping to object %d\n", object);
 
+    _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
+
     _free_ig_object(p);
 
+    p->playing_object = NULL;
+
     p->pc     = 0;
     p->object = &p->movie_objects->objects[object];
 
@@ -387,6 +462,7 @@
 
         /* discard suspended object */
         p->suspended_object = NULL;
+        p->playing_object = NULL;
         bd_psr_reset_backup_registers(p->regs);
 
         _queue_event(p, HDMV_EVENT_TITLE, title);
@@ -402,6 +478,7 @@
 {
     BD_DEBUG(DBG_HDMV, "_call_object(%d)\n", object);
 
+    _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
     _suspend_object(p, 1);
 
     return _jump_object(p, object);
@@ -415,6 +492,7 @@
         _suspend_object(p, 1);
 
         _queue_event(p, HDMV_EVENT_TITLE, title);
+
         return 0;
     }
 
@@ -448,7 +526,7 @@
 
     if (playlist >= 0) {
         _queue_event(p, HDMV_EVENT_PLAY_PL, playlist);
-        _suspend_object(p, 0);
+        _suspend_for_play_pl(p);
     }
 
     if (playitem >= 0) {
@@ -471,6 +549,7 @@
 
     BD_DEBUG(DBG_HDMV, "_play_stop()\n");
     _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);
+
     return 0;
 }
 
@@ -992,7 +1071,7 @@
 
     bd_mutex_lock(&p->mutex);
 
-    if ((o = p->object ? p->object : p->suspended_object)) {
+    if ((o = p->object ? p->object : (p->playing_object ? p->playing_object : p->suspended_object))) {
         mask |= o->menu_call_mask;
         mask |= o->title_search_mask << 1;
     }
@@ -1006,7 +1085,7 @@
     int result;
     bd_mutex_lock(&p->mutex);
 
-    result = _resume_object(p, 0);
+    result = _resume_from_play_pl(p);
 
     bd_mutex_unlock(&p->mutex);
     return result;
@@ -1020,19 +1099,21 @@
     if (p->object || p->ig_object) {
         BD_DEBUG(DBG_HDMV, "hdmv_vm_suspend_pl(): HDMV VM is still running\n");
 
-    } else if (!p->suspended_object) {
-        BD_DEBUG(DBG_HDMV, "hdmv_vm_suspend_pl(): No suspended object\n");

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/hdmv/mobj_parse.c -> libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/mobj_parse.c Changed

@@ -24,6 +24,7 @@
 #include "mobj_parse.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 #define MOBJ_SIG1  ('M' << 24 | 'O' << 16 | 'B' << 8 | 'J')
 #define MOBJ_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0')
@@ -109,7 +110,7 @@
     }
 }
 
-MOBJ_OBJECTS *mobj_parse(const char *file_name)
+static MOBJ_OBJECTS *_mobj_parse(const char *file_name)
 {
     BITSTREAM     bs;
     BD_FILE_H    *fp;
@@ -134,6 +135,12 @@
     bs_seek_byte(&bs, 40);
 
     data_len = bs_read(&bs, 32);
+
+    if ((bs_end(&bs) - bs_pos(&bs))/8 < (off_t)data_len) {
+        BD_DEBUG(DBG_NAV | DBG_CRIT, "%s: invalid data_len %d !\n", file_name, data_len);
+        goto error;
+    }
+
     bs_skip(&bs, 32); /* reserved */
     num_objects = bs_read(&bs, 16);
 
@@ -156,3 +163,23 @@
     file_close(fp);
     return NULL;
 }
+
+MOBJ_OBJECTS *mobj_parse(const char *file_name)
+{
+    MOBJ_OBJECTS *objects = _mobj_parse(file_name);
+
+    /* if failed, try backup file */
+    if (!objects) {
+        int   len    = strlen(file_name);
+        char *backup = malloc(len + 8);
+
+        strcpy(backup, file_name);
+        strcpy(backup + len - 16, "BACKUP/MovieObject.bdmv");
+
+        objects = _mobj_parse(backup);
+
+        X_FREE(backup);
+    }
+
+    return objects;
+}

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/hdmv/mobj_parse.h -> libbluray-0.2.3.tar.bz2/src/libbluray/hdmv/mobj_parse.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/register.c -> libbluray-0.2.3.tar.bz2/src/libbluray/register.c Changed

@@ -252,6 +252,22 @@
     memcpy(p->psr + 36, p->psr + 4,  sizeof(uint32_t) * 5);
     memcpy(p->psr + 42, p->psr + 10, sizeof(uint32_t) * 3);
 
+    /* generate save event */
+
+    if (p->num_cb) {
+        BD_PSR_EVENT ev = {
+            .ev_type = BD_PSR_SAVE,
+            .psr_idx = -1,
+            .old_val = 0,
+            .new_val = 0,
+        };
+
+        unsigned j;
+        for (j = 0; j < p->num_cb; j++) {
+            p->cb[j].cb(p->cb[j].handle, &ev);
+        }
+    }
+
     bd_psr_unlock(p);
 }
 
@@ -367,14 +383,11 @@
         return -1;
     }
 
-    if (p->psr[reg] == val) {
-        BD_DEBUG(DBG_BLURAY, "bd_psr_write(%d, %d): no change in value\n", reg, val);
-        return 0;
-    }
-
     bd_psr_lock(p);
 
-    if (bd_psr_name[reg]) {
+    if (p->psr[reg] == val) {
+        BD_DEBUG(DBG_BLURAY, "bd_psr_write(%d, %d): no change in value\n", reg, val);
+    } else if (bd_psr_name[reg]) {
         BD_DEBUG(DBG_BLURAY, "bd_psr_write(): PSR%-4d (%s) 0x%x -> 0x%x\n", reg, bd_psr_name[reg], p->psr[reg], val);
     } else {
         BD_DEBUG(DBG_BLURAY, "bd_psr_write(): PSR%-4d 0x%x -> 0x%x\n", reg, p->psr[reg], val);
@@ -384,7 +397,7 @@
         BD_PSR_EVENT ev;
         unsigned i;
 
-        ev.ev_type = BD_PSR_CHANGE;
+        ev.ev_type = p->psr[reg] == val ? BD_PSR_WRITE : BD_PSR_CHANGE;
         ev.psr_idx = reg;
         ev.old_val = p->psr[reg];
         ev.new_val = val;

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/libbluray/register.h -> libbluray-0.2.3.tar.bz2/src/libbluray/register.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/util/bits.h -> libbluray-0.2.3.tar.bz2/src/util/bits.h Changed

libbluray-0.0.1-pre-213-ga869da8.tar.gz/src/util/mutex.h -> libbluray-0.2.3.tar.bz2/src/util/mutex.h Changed

libogg-1.3.0.tar.gz Deleted

libsamplerate-0.1.4.tar.gz Deleted

libtheora-1.1.0.tar.bz2 Deleted

libvorbis-aotuv_b6.03.tar.bz2 Deleted

libxml2-2.7.7.tar.gz Deleted

x264-r2146-bcd41db.tar.gz Deleted

x264-r2273-b3065e6.tar.gz Added

yasm-1.1.0.tar.gz/Makefile.am -> yasm-1.2.0.tar.gz/Makefile.am Changed

@@ -1,5 +1,3 @@
-# $Id: Makefile.am 2299 2010-03-04 05:08:00Z peter $
-
 SUBDIRS = po .
 
 ACLOCAL_AMFLAGS = -I m4
@@ -33,6 +31,8 @@
 
 # libyasm-stdint.h doesn't clean up after itself?
 CONFIG_CLEAN_FILES = libyasm-stdint.h
+CONFIG_CLEAN_FILES += YASM-VERSION-FILE
+CONFIG_CLEAN_FILES += YASM-VERSION.h
 
 EXTRA_DIST += tools/Makefile.inc
 EXTRA_DIST += libyasm/Makefile.inc
@@ -57,6 +57,7 @@
 EXTRA_DIST += GNU_GPL-2.0
 EXTRA_DIST += GNU_LGPL-2.0
 EXTRA_DIST += splint.sh
+EXTRA_DIST += YASM-VERSION-GEN.sh
 EXTRA_DIST += Mkfiles/Makefile.flat
 EXTRA_DIST += Mkfiles/Makefile.dj
 EXTRA_DIST += Mkfiles/dj/config.h
@@ -89,6 +90,7 @@
 EXTRA_DIST += Mkfiles/vc10/crt_secure_no_deprecate.props
 EXTRA_DIST += Mkfiles/vc10/crt_secure_no_deprecate.vsprops
 EXTRA_DIST += Mkfiles/vc10/libyasm-stdint.h
+EXTRA_DIST += Mkfiles/vc10/out_copy_rename.bat
 EXTRA_DIST += Mkfiles/vc10/readme.vc10.txt
 EXTRA_DIST += Mkfiles/vc10/vsyasm.props
 EXTRA_DIST += Mkfiles/vc10/vsyasm.targets
@@ -124,6 +126,15 @@
 # Until this gets fixed in automake
 DISTCLEANFILES += libyasm/stamp-h libyasm/stamp-h[0-9]*
 
+dist-hook: YASM-VERSION-FILE YASM-VERSION.h
+	cp YASM-VERSION-FILE $(distdir)/version
+	cp YASM-VERSION.h $(distdir)/Mkfiles/dj/
+	cp YASM-VERSION.h $(distdir)/Mkfiles/vc9/
+	cp YASM-VERSION.h $(distdir)/Mkfiles/vc10/
+
+YASM-VERSION-FILE: $(top_srcdir)/YASM-VERSION-GEN.sh
+	$(top_srcdir)/YASM-VERSION-GEN.sh
+
 distclean-local:
 	-rm -rf results
 if HAVE_PYTHON

yasm-1.1.0.tar.gz/Makefile.in -> yasm-1.2.0.tar.gz/Makefile.in Changed

@@ -15,184 +15,24 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 2299 2010-03-04 05:08:00Z peter $
-
-# $Id: Makefile.inc 2084 2008-05-09 07:08:17Z peter $
-
-# $Id: Makefile.inc 2234 2009-10-31 21:52:42Z peter $
-
 # These utility programs have to be built for BUILD host in cross-build.
 # This makes things rather non-standard automake
 
-# $Id: Makefile.inc 2234 2009-10-31 21:52:42Z peter $
-
 # These utility programs have to be built for BUILD host in cross-build.
 # This makes things rather non-standard automake
 
-# $Id: Makefile.inc 2234 2009-10-31 21:52:42Z peter $
-
 # These utility programs have to be built for BUILD host in cross-build.
 # This makes things rather non-standard automake
 
-# $Id: Makefile.inc 2256 2010-01-01 20:55:07Z peter $
-
-# $Id: Makefile.inc 1951 2007-09-14 05:19:10Z peter $
-
-# $Id: Makefile.inc 1598 2006-08-10 04:02:59Z peter $
-
-# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $
-
-# $Id: Makefile.inc 2111 2008-07-06 22:26:49Z peter $
-
-# $Id: Makefile.inc 2339 2010-07-23 03:35:21Z peter $
-
-# $Id: Makefile.inc 2239 2009-12-01 03:33:03Z peter $
-
-# $Id: Makefile.inc 2238 2009-11-30 03:43:10Z peter $
-
-# $Id: Makefile.inc 2111 2008-07-06 22:26:49Z peter $
-
-# $Id: Makefile.inc 1928 2007-09-07 22:03:34Z peter $
-
-# $Id: Makefile.inc 1152 2004-10-02 06:18:30Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $
-
-# $Id: Makefile.inc 2279 2010-01-19 07:57:43Z peter $
-
-# $Id: Makefile.inc 2169 2009-01-02 20:46:57Z peter $
-
-# $Id$
-
-# $Id: Makefile.inc 2278 2010-01-19 07:28:08Z peter $
-
-# $Id: Makefile.inc 2323 2010-05-16 03:37:00Z peter $
-
-# $Id: Makefile.inc 1137 2004-09-04 01:24:57Z peter $
-
-# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $
-
-# $Id: Makefile.inc 2063 2008-04-12 08:30:22Z peter $
-
-# $Id: Makefile.inc 2063 2008-04-12 08:30:22Z peter $
-
-# $Id: Makefile.inc 2243 2009-12-23 06:45:17Z peter $
-
-# $Id$
-
-# $Id$
-
-# $Id: Makefile.inc 2130 2008-10-07 05:38:11Z peter $
-
-# $Id: Makefile.inc 2311 2010-04-08 03:32:04Z peter $
-
-# $Id: Makefile.inc 2172 2009-01-27 06:38:14Z peter $
-
-# $Id: Makefile.inc 2176 2009-03-04 07:39:02Z peter $
-
 # Makefile for cpp module.
 # Copied from raw preprocessor module.
 
-# $Id: Makefile.inc 2268 2010-01-07 06:55:03Z peter $
-
-# $Id: Makefile.inc 2243 2009-12-23 06:45:17Z peter $
-
 #TESTS += modules/preprocs/gas/tests/rawpp_test.sh
 
-# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $
-
-# $Id: Makefile.inc 1428 2006-03-27 02:15:19Z peter $
-
-# $Id: Makefile.inc 1378 2006-02-12 01:27:39Z peter $
-
-# $Id: Makefile.inc 1350 2006-01-29 21:11:03Z peter $
-
-# $Id: Makefile.inc 1851 2007-05-26 17:56:36Z peter $
-
-# $Id: Makefile.inc 1617 2006-09-16 05:43:41Z peter $
-
-# $Id: Makefile.inc 1350 2006-01-29 21:11:03Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id$
-
-# $Id: Makefile.inc 2269 2010-01-07 07:00:05Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id: Makefile.inc 2130 2008-10-07 05:38:11Z peter $
-
-# $Id: Makefile.inc 2010 2007-11-14 08:33:32Z peter $
-
-# $Id: Makefile.inc 2010 2007-11-14 08:33:32Z peter $
-
-# $Id: Makefile.inc 1252 2005-09-28 05:50:51Z peter $
-
-# $Id: Makefile.inc 2036 2008-02-09 04:06:47Z peter $
-
-# $Id: Makefile.inc 2126 2008-10-03 08:13:00Z peter $
-
-# $Id: Makefile.inc 2206 2009-07-21 06:48:42Z peter $
-
-# $Id: Makefile.inc 1168 2004-10-31 01:07:52Z peter $
-
-# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $
-
-# $Id: Makefile.inc 1617 2006-09-16 05:43:41Z peter $
-
-# $Id: Makefile.inc 1732 2007-01-13 19:34:04Z peter $
-
-# $Id: Makefile.inc 1777 2007-02-19 08:21:17Z peter $
-
-# $Id: Makefile.inc 1782 2007-02-21 06:45:39Z peter $
-
-# $Id: Makefile.inc 2108 2008-06-05 08:48:21Z peter $
-
-# $Id: Makefile.inc 2345 2010-08-01 01:27:40Z peter $
-
-# $Id: Makefile.inc 2108 2008-06-05 08:48:21Z peter $
-
-# $Id: Makefile.inc 1653 2006-10-17 06:58:41Z peter $
-
-# $Id: Makefile.inc 1653 2006-10-17 06:58:41Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
 # Assume objfmt_coff is included
 
-# $Id: Makefile.inc 2166 2009-01-02 08:33:21Z peter $
-
-# $Id: Makefile.inc 2166 2009-01-02 08:33:21Z peter $
-
-# $Id: Makefile.inc 1331 2006-01-15 22:48:55Z peter $
-
 # Assume objfmt_coff is included
 
-# $Id: Makefile.inc 2120 2008-09-04 04:45:30Z peter $
-
-# $Id: Makefile.inc 2082 2008-05-09 06:46:02Z peter $
-
-# $Id: Makefile.inc 1183 2004-12-01 07:49:18Z peter $
-
-# $Id: Makefile.inc 1851 2007-05-26 17:56:36Z peter $
-
-# $Id: Makefile.inc 2111 2008-07-06 22:26:49Z peter $
-
-# $Id: Makefile.inc 2233 2009-10-31 21:45:55Z peter $
-
-# $Id: Makefile.inc 2284 2010-02-06 09:27:32Z peter $
-
-# $Id: Makefile.inc 1463 2006-04-05 05:39:23Z peter $
-
-# $Id: Makefile.inc 1463 2006-04-05 05:39:23Z peter $
-
-# $Id: Makefile.inc 1463 2006-04-05 05:39:23Z peter $
-
 
 
 VPATH = @srcdir@
@@ -228,6 +68,7 @@
 	modules/preprocs/tasm/tests/tasmpp_test.sh \
 	modules/preprocs/nasm/tests/nasmpp_test.sh \
 	modules/preprocs/raw/tests/rawpp_test.sh \
+	modules/dbgfmts/dwarf2/tests/gen64/dwarf2_gen64_test.sh \
 	modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh \
 	modules/dbgfmts/dwarf2/tests/pass64/dwarf2_pass64_test.sh \
 	modules/dbgfmts/dwarf2/tests/passwin64/dwarf2_passwin64_test.sh \
@@ -280,6 +121,7 @@
 	$(srcdir)/modules/dbgfmts/codeview/Makefile.inc \
 	$(srcdir)/modules/dbgfmts/dwarf2/Makefile.inc \
 	$(srcdir)/modules/dbgfmts/dwarf2/tests/Makefile.inc \
+	$(srcdir)/modules/dbgfmts/dwarf2/tests/gen64/Makefile.inc \
 	$(srcdir)/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc \
 	$(srcdir)/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc \

yasm-1.1.0.tar.gz/Mkfiles/Makefile.dj -> yasm-1.2.0.tar.gz/Mkfiles/Makefile.dj Changed

yasm-1.1.0.tar.gz/Mkfiles/Makefile.flat -> yasm-1.2.0.tar.gz/Mkfiles/Makefile.flat Changed

yasm-1.2.0.tar.gz/Mkfiles/dj/YASM-VERSION.h Added

yasm-1.1.0.tar.gz/Mkfiles/dj/config.h -> yasm-1.2.0.tar.gz/Mkfiles/dj/config.h Changed

@@ -1,5 +1,4 @@
-/* $Id: config.h 2353 2010-08-07 16:37:52Z peter $ */
-
+#include "YASM-VERSION.h"
 #define yasm__splitpath(path, tail)     yasm__splitpath_win(path, tail)
 #define yasm__abspath(path)             yasm__abspath_win(path)
 #define yasm__combpath(from, to)        yasm__combpath_win(from, to)
@@ -118,23 +117,17 @@
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
 
-/* Define to build version of this package. */
-#define PACKAGE_BUILD "2352"
-
-/* Define to internal version of this package. */
-#define PACKAGE_INTVER "1.1.0"
-
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "yasm"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm 1.1.0"
+/*#define PACKAGE_STRING "yasm HEAD"*/
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yasm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+/*#define PACKAGE_VERSION "HEAD"*/
 
 /* Define if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
@@ -158,7 +151,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "HEAD"
 
 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */

yasm-1.2.0.tar.gz/Mkfiles/vc10/YASM-VERSION.h Added

yasm-1.1.0.tar.gz/Mkfiles/vc10/config.h -> yasm-1.2.0.tar.gz/Mkfiles/vc10/config.h Changed

@@ -1,5 +1,4 @@
-/* $Id: config.h 1137 2004-09-04 01:24:57Z peter $ */
-
+#include "YASM-VERSION.h"
 #define yasm__splitpath(path, tail)     yasm__splitpath_win(path, tail)
 #define yasm__abspath(path)             yasm__abspath_win(path)
 #define yasm__combpath(from, to)        yasm__combpath_win(from, to)
@@ -116,23 +115,17 @@
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
 
-/* Define to build version of this package. */
-#define PACKAGE_BUILD "2352"
-
-/* Define to internal version of this package. */
-#define PACKAGE_INTVER "1.1.0"
-
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "yasm"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm 1.1.0"
+/*#define PACKAGE_STRING "yasm HEAD"*/
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yasm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+/*#define PACKAGE_VERSION "HEAD"*/
 
 /* Define if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
@@ -156,7 +149,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "HEAD"
 
 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */

yasm-1.1.0.tar.gz/Mkfiles/vc10/genmodule/genmodule.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genmodule/genmodule.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/genmodule/genmodule.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genmodule/genmodule.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/genperf/genperf.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genperf/genperf.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/genperf/genperf.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genperf/genperf.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/genversion/genversion.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/genversion/genversion.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/libyasm/libyasm.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/libyasm/libyasm.vcxproj Changed

@@ -226,6 +226,7 @@
     <ClCompile Include="..\..\..\libyasm\xstrdup.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\libyasm.h" />
     <ClInclude Include="..\..\..\libyasm\file.h" />
     <ClInclude Include="..\..\..\libyasm\arch.h" />
     <ClInclude Include="..\..\..\libyasm\assocdat.h" />
@@ -242,7 +243,9 @@
     <ClInclude Include="..\..\..\libyasm\intnum.h" />
     <ClInclude Include="..\..\..\libyasm\inttree.h" />
     <ClInclude Include="..\..\..\libyasm\linemap.h" />
+    <ClInclude Include="..\..\..\libyasm\listfmt.h" />
     <ClInclude Include="..\..\..\libyasm\md5.h" />
+    <ClInclude Include="..\..\..\libyasm\module.h" />
     <ClInclude Include="..\..\..\libyasm\objfmt.h" />
     <ClInclude Include="..\..\..\libyasm\parser.h" />
     <ClInclude Include="..\..\..\libyasm\phash.h" />
@@ -251,6 +254,9 @@
     <ClInclude Include="..\..\..\libyasm\symrec.h" />
     <ClInclude Include="..\..\..\libyasm\valparam.h" />
     <ClInclude Include="..\..\..\libyasm\value.h" />
+    <ClInclude Include="..\..\..\util.h" />
+    <ClInclude Include="..\config.h" />
+    <ClInclude Include="..\libyasm-stdint.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\libyasm\module.in" />

yasm-1.1.0.tar.gz/Mkfiles/vc10/libyasm/libyasm.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/libyasm/libyasm.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/modules/modules.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/modules/modules.vcxproj Changed

@@ -250,6 +250,32 @@
     <ClCompile Include="..\..\..\modules\listfmts\nasm\nasm-listfmt.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\libyasm.h" />
+    <ClInclude Include="..\..\..\libyasm\arch.h" />
+    <ClInclude Include="..\..\..\libyasm\bitvect.h" />
+    <ClInclude Include="..\..\..\libyasm\bytecode.h" />
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h" />
+    <ClInclude Include="..\..\..\libyasm\coretype.h" />
+    <ClInclude Include="..\..\..\libyasm\dbgfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\errwarn.h" />
+    <ClInclude Include="..\..\..\libyasm\expr.h" />
+    <ClInclude Include="..\..\..\libyasm\file.h" />
+    <ClInclude Include="..\..\..\libyasm\floatnum.h" />
+    <ClInclude Include="..\..\..\libyasm\hamt.h" />
+    <ClInclude Include="..\..\..\libyasm\insn.h" />
+    <ClInclude Include="..\..\..\libyasm\intnum.h" />
+    <ClInclude Include="..\..\..\libyasm\linemap.h" />
+    <ClInclude Include="..\..\..\libyasm\listfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\md5.h" />
+    <ClInclude Include="..\..\..\libyasm\module.h" />
+    <ClInclude Include="..\..\..\libyasm\objfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\parser.h" />
+    <ClInclude Include="..\..\..\libyasm\phash.h" />
+    <ClInclude Include="..\..\..\libyasm\preproc.h" />
+    <ClInclude Include="..\..\..\libyasm\section.h" />
+    <ClInclude Include="..\..\..\libyasm\symrec.h" />
+    <ClInclude Include="..\..\..\libyasm\valparam.h" />
+    <ClInclude Include="..\..\..\libyasm\value.h" />
     <ClInclude Include="..\..\..\modules\arch\lc3b\lc3barch.h" />
     <ClInclude Include="..\..\..\modules\arch\x86\x86arch.h" />
     <ClInclude Include="..\..\..\modules\dbgfmts\codeview\cv-dbgfmt.h" />
@@ -258,12 +284,16 @@
     <ClInclude Include="..\..\..\modules\objfmts\elf\elf-machine.h" />
     <ClInclude Include="..\..\..\modules\objfmts\elf\elf.h" />
     <ClInclude Include="..\..\..\modules\parsers\gas\gas-parser.h" />
+    <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser-struct.h" />
     <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser.h" />
     <ClInclude Include="..\..\..\modules\preprocs\gas\gas-eval.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm-eval.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm-pp.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasm.h" />
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasmlib.h" />
+    <ClInclude Include="..\..\..\util.h" />
+    <ClInclude Include="..\config.h" />
+    <ClInclude Include="..\libyasm-stdint.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\genmacro\genmacro.vcxproj">

yasm-1.1.0.tar.gz/Mkfiles/vc10/modules/modules.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/modules/modules.vcxproj.filters Changed

@@ -219,5 +219,35 @@
     <ClInclude Include="..\..\..\modules\preprocs\nasm\nasmlib.h">
       <Filter>Source Files\preprocs\nasm</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\libyasm\arch.h" />
+    <ClInclude Include="..\..\..\libyasm\bitvect.h" />
+    <ClInclude Include="..\..\..\libyasm\bytecode.h" />
+    <ClInclude Include="..\..\..\libyasm\compat-queue.h" />
+    <ClInclude Include="..\config.h" />
+    <ClInclude Include="..\..\..\libyasm\coretype.h" />
+    <ClInclude Include="..\..\..\libyasm\dbgfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\errwarn.h" />
+    <ClInclude Include="..\..\..\libyasm\expr.h" />
+    <ClInclude Include="..\..\..\libyasm\file.h" />
+    <ClInclude Include="..\..\..\libyasm\floatnum.h" />
+    <ClInclude Include="..\..\..\libyasm\hamt.h" />
+    <ClInclude Include="..\..\..\libyasm\insn.h" />
+    <ClInclude Include="..\..\..\libyasm\intnum.h" />
+    <ClInclude Include="..\libyasm-stdint.h" />
+    <ClInclude Include="..\..\..\libyasm.h" />
+    <ClInclude Include="..\..\..\libyasm\listfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\md5.h" />
+    <ClInclude Include="..\..\..\libyasm\module.h" />
+    <ClInclude Include="..\..\..\modules\parsers\nasm\nasm-parser-struct.h" />
+    <ClInclude Include="..\..\..\libyasm\objfmt.h" />
+    <ClInclude Include="..\..\..\libyasm\parser.h" />
+    <ClInclude Include="..\..\..\libyasm\phash.h" />
+    <ClInclude Include="..\..\..\libyasm\preproc.h" />
+    <ClInclude Include="..\..\..\libyasm\value.h" />
+    <ClInclude Include="..\..\..\libyasm\valparam.h" />
+    <ClInclude Include="..\..\..\libyasm\symrec.h" />
+    <ClInclude Include="..\..\..\libyasm\linemap.h" />
+    <ClInclude Include="..\..\..\libyasm\section.h" />
+    <ClInclude Include="..\..\..\util.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file

yasm-1.2.0.tar.gz/Mkfiles/vc10/out_copy_rename.bat Added

yasm-1.1.0.tar.gz/Mkfiles/vc10/re2c/re2c.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/re2c/re2c.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/re2c/re2c.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/re2c/re2c.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/readme.vc10.txt -> yasm-1.2.0.tar.gz/Mkfiles/vc10/readme.vc10.txt Changed

@@ -2,7 +2,7 @@
 -----------------------------------------------------------
 
 This note describes how to build YASM using Microsoft Visual
-Studio 2010 (C/C++ v10 - currently releasxed as beta 2).  
+Studio 2010 (C/C++ v10).
 
 1. The Compiler
 ---------------
@@ -36,18 +36,22 @@
 --------------------------------------------------------
 
 The YASM version vsyasm.exe is designed specifically for use
-with Visual Studio 2010.  To tell Visual Studio where to find
+with Visual Studio 2010. To tell Visual Studio where to find
 vsyasm.exe, the environment variable YASMPATH can be set to 
 the absolute path of the directory in which vsyasm.exe is
 located (this path should include the final backslash). 
 
 Alternatively you can find the directory (or directories) 
 where the VC++ compiler binaries are located and put copies 
-of the vsyasm.exe binary in these directories. A typical 
-location is:
+of the vsyasm.exe binary in these directories. The typical 
+location on 64-bit Windows is:
 
 C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin
 
+On 32-bit Windows it is normally at:
+  
+C:\Program Files\Microsoft Visual Studio 10.0\VC\bin
+
 Depending on your system you can use either the win32 or the
 x64 version of vsyasm.exe, which must be named vsyasm.exe. 
 
@@ -61,6 +65,10 @@
   which is typically at:
 
     C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations
+  
+  or:
+  
+    C:\Program Files\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations
 
   b. put them in a convenient location and set this path in the 
      'Build Customisations Search Path' in the Visual Studio 
@@ -108,4 +116,4 @@
 YASM's creator, has given me in tracking down issues in using
 YASM for the production of Windows x64 code.
 
-  Brian Gladman, 10th June 2010
+  Brian Gladman, 29th January 2011

yasm-1.1.0.tar.gz/Mkfiles/vc10/vsyasm.props -> yasm-1.2.0.tar.gz/Mkfiles/vc10/vsyasm.props Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/vsyasm.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/vsyasm.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/yasm.sln -> yasm-1.2.0.tar.gz/Mkfiles/vc10/yasm.sln Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/yasm.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/yasm.vcxproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/yasm.vcxproj.filters -> yasm-1.2.0.tar.gz/Mkfiles/vc10/yasm.vcxproj.filters Changed

yasm-1.1.0.tar.gz/Mkfiles/vc10/ytasm.vcxproj -> yasm-1.2.0.tar.gz/Mkfiles/vc10/ytasm.vcxproj Changed

yasm-1.2.0.tar.gz/Mkfiles/vc9/YASM-VERSION.h Added

yasm-1.1.0.tar.gz/Mkfiles/vc9/config.h -> yasm-1.2.0.tar.gz/Mkfiles/vc9/config.h Changed

@@ -1,5 +1,4 @@
-/* $Id: config.h 1137 2004-09-04 01:24:57Z peter $ */
-
+#include "YASM-VERSION.h"
 #define yasm__splitpath(path, tail)     yasm__splitpath_win(path, tail)
 #define yasm__abspath(path)             yasm__abspath_win(path)
 #define yasm__combpath(from, to)        yasm__combpath_win(from, to)
@@ -116,23 +115,17 @@
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
 
-/* Define to build version of this package. */
-#define PACKAGE_BUILD "2352"
-
-/* Define to internal version of this package. */
-#define PACKAGE_INTVER "1.1.0"
-
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "yasm"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm 1.1.0"
+/*#define PACKAGE_STRING "yasm HEAD"*/
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yasm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+/*#define PACKAGE_VERSION "HEAD"*/
 
 /* Define if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
@@ -156,7 +149,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "HEAD"
 
 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */

yasm-1.1.0.tar.gz/Mkfiles/vc9/genversion/genversion.vcproj -> yasm-1.2.0.tar.gz/Mkfiles/vc9/genversion/genversion.vcproj Changed

yasm-1.1.0.tar.gz/Mkfiles/vc9/yasm.rules -> yasm-1.2.0.tar.gz/Mkfiles/vc9/yasm.rules Changed

@@ -19,7 +19,7 @@
 					DisplayName="Definitions"
 					Category="Pre-Defined Symbols"
 					Description="Specify pre-defined symbols (&apos;symbol&apos; or &apos;symbol = value&apos;) "
-					Switch="-D [value]"
+					Switch="-D &quot;[value]&quot;"
 					Delimited="true"
 					Inheritable="true"
 				/>
@@ -28,7 +28,7 @@
 					DisplayName="Include Paths"
 					Category="Configuration"
 					Description="Set the paths for any additional include files"
-					Switch="-I [value]"
+					Switch="-I &quot;[value]&quot;"
 					Delimited="true"
 					Inheritable="true"
 				/>
@@ -37,7 +37,7 @@
 					DisplayName="Remove Definitions"
 					Category="Pre-Defined Symbols"
 					Description="Remove pre-defined symbols "
-					Switch="-U [value]"
+					Switch="-U &quot;[value]&quot;"
 					Delimited="true"
 					Inheritable="true"
 				/>
@@ -46,7 +46,7 @@
 					DisplayName="Object File Name"
 					Category="Output"
 					Description="Select the output file name"
-					Switch="-o [value]"
+					Switch="-o &quot;[value]&quot;"
 					DefaultValue="$(IntDir)\$(InputName).obj"
 				/>
         <StringProperty
@@ -54,14 +54,14 @@
 					DisplayName="List File Name"
 					Category="Output"
 					Description="Select an output listing by setting its file name"
-					Switch="-l [value]"
+					Switch="-l &quot;[value]&quot;"
 				/>
         <StringProperty
 					Name="PreIncludeFile"
 					DisplayName="Pre Include File"
 					Category="Configuration"
 					Description="Select a pre-included file by setting its name"
-					Switch="-P [value]"
+					Switch="-P &quot;[value]&quot;"
 				/>
         <BooleanProperty
 					Name="Debug"

yasm-1.1.0.tar.gz/Mkfiles/vc9/yasm.sln -> yasm-1.2.0.tar.gz/Mkfiles/vc9/yasm.sln Changed

yasm-1.2.0.tar.gz/YASM-VERSION-GEN.sh Added

yasm-1.1.0.tar.gz/aclocal.m4 -> yasm-1.2.0.tar.gz/aclocal.m4 Changed

@@ -13,12 +13,64 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
+# intlmacosx.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    [gt_cv_func_CFPreferencesCopyAppValue],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -843,7 +895,7 @@
   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
   dnl supported. (2.0 was released on October 16, 2000).
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-                    [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
+                    [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
 python2.1 python2.0])
 
   m4_if([$1],[],[

yasm-1.1.0.tar.gz/config.h.in -> yasm-1.2.0.tar.gz/config.h.in Changed

yasm-1.1.0.tar.gz/configure -> yasm-1.2.0.tar.gz/configure Changed

@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for yasm 1.1.0.
+# Generated by GNU Autoconf 2.68 for yasm 1.2.0.
 #
 # Report bugs to <bug-yasm@tortall.net>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +91,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,11 +217,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -319,7 +327,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -359,19 +367,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -533,7 +541,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -552,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='yasm'
 PACKAGE_TARNAME='yasm'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='yasm 1.1.0'
+PACKAGE_VERSION='1.2.0'
+PACKAGE_STRING='yasm 1.2.0'
 PACKAGE_BUGREPORT='bug-yasm@tortall.net'
 PACKAGE_URL=''
 
@@ -624,6 +632,7 @@
 INTLLIBS
 LTLIBICONV
 LIBICONV
+INTL_MACOSX_LIBS
 host_os
 host_vendor
 host_cpu
@@ -824,8 +833,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -870,7 +880,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -896,7 +906,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1100,7 +1110,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1116,7 +1126,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1146,8 +1156,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1155,7 +1165,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1165,7 +1175,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1173,13 +1183,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;

yasm-1.1.0.tar.gz/configure.ac -> yasm-1.2.0.tar.gz/configure.ac Changed

yasm-1.1.0.tar.gz/frontends/Makefile.inc -> yasm-1.2.0.tar.gz/frontends/Makefile.inc Changed

yasm-1.1.0.tar.gz/frontends/tasm/Makefile.inc -> yasm-1.2.0.tar.gz/frontends/tasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/frontends/tasm/tasm-options.c -> yasm-1.2.0.tar.gz/frontends/tasm/tasm-options.c Changed

yasm-1.1.0.tar.gz/frontends/tasm/tasm-options.h -> yasm-1.2.0.tar.gz/frontends/tasm/tasm-options.h Changed

yasm-1.1.0.tar.gz/frontends/tasm/tasm.c -> yasm-1.2.0.tar.gz/frontends/tasm/tasm.c Changed

yasm-1.1.0.tar.gz/frontends/vsyasm/Makefile.inc -> yasm-1.2.0.tar.gz/frontends/vsyasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/frontends/vsyasm/vsyasm.c -> yasm-1.2.0.tar.gz/frontends/vsyasm/vsyasm.c Changed

yasm-1.1.0.tar.gz/frontends/yasm/Makefile.inc -> yasm-1.2.0.tar.gz/frontends/yasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/frontends/yasm/yasm-options.c -> yasm-1.2.0.tar.gz/frontends/yasm/yasm-options.c Changed

yasm-1.1.0.tar.gz/frontends/yasm/yasm-options.h -> yasm-1.2.0.tar.gz/frontends/yasm/yasm-options.h Changed

yasm-1.1.0.tar.gz/frontends/yasm/yasm.c -> yasm-1.2.0.tar.gz/frontends/yasm/yasm.c Changed

yasm-1.1.0.tar.gz/frontends/yasm/yasm.xml -> yasm-1.2.0.tar.gz/frontends/yasm/yasm.xml Changed

@@ -2,8 +2,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
           "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
-     
-
 <refentry id="yasm">
 
  <refentryinfo>
@@ -172,16 +170,6 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>-h</option> or <option>--help</option>: Print a
-      summary of options</term>
-
-     <listitem>
-      <para>Prints a summary of invocation options.  All other options
-       are ignored, and no output file is generated.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry>
      <term><option>-L <replaceable>list</replaceable></option> or
       <option>--lformat=<replaceable>list</replaceable></option>:
       Select list file format</term>
@@ -290,6 +278,16 @@
     </varlistentry>
 
     <varlistentry>
+     <term><option>-h</option> or <option>--help</option>: Print a
+      summary of options</term>
+
+     <listitem>
+      <para>Prints a summary of invocation options.  All other options
+       are ignored, and no output file is generated.</para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
      <term><option>--version</option>: Get the Yasm version</term>
 
      <listitem>

yasm-1.1.0.tar.gz/genstring.c -> yasm-1.2.0.tar.gz/genstring.c Changed

yasm-1.1.0.tar.gz/libyasm.h -> yasm-1.2.0.tar.gz/libyasm.h Changed

yasm-1.1.0.tar.gz/libyasm/Makefile.inc -> yasm-1.2.0.tar.gz/libyasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/libyasm/arch.h -> yasm-1.2.0.tar.gz/libyasm/arch.h Changed

yasm-1.1.0.tar.gz/libyasm/assocdat.c -> yasm-1.2.0.tar.gz/libyasm/assocdat.c Changed

yasm-1.1.0.tar.gz/libyasm/assocdat.h -> yasm-1.2.0.tar.gz/libyasm/assocdat.h Changed

yasm-1.1.0.tar.gz/libyasm/bc-align.c -> yasm-1.2.0.tar.gz/libyasm/bc-align.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-align.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -58,7 +57,8 @@
 static int bc_align_expand(yasm_bytecode *bc, int span, long old_val,
                            long new_val, /*@out@*/ long *neg_thres,
                            /*@out@*/ long *pos_thres);
-static int bc_align_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_align_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                            unsigned char *bufstart, void *d,
                             yasm_output_value_func output_value,
                             /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -164,7 +164,8 @@
 }
 
 static int
-bc_align_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_align_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                 unsigned char *bufstart, void *d,
                  yasm_output_value_func output_value,
                  /*@unused@*/ yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/libyasm/bc-data.c -> yasm-1.2.0.tar.gz/libyasm/bc-data.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-data.c 2133 2008-10-07 05:59:29Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -70,7 +69,8 @@
 static int bc_data_item_size(yasm_bytecode *bc);
 static int bc_data_calc_len(yasm_bytecode *bc, yasm_bc_add_span_func add_span,
                             void *add_span_data);
-static int bc_data_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_data_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                           unsigned char *bufstart, void *d,
                            yasm_output_value_func output_value,
                            /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -203,13 +203,13 @@
 }
 
 static int
-bc_data_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_data_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                unsigned char *bufstart, void *d,
                 yasm_output_value_func output_value,
                 /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     bytecode_data *bc_data = (bytecode_data *)bc->contents;
     yasm_dataval *dv;
-    unsigned char *bufp_orig = *bufp;
     yasm_intnum *intn;
     unsigned int val_len;
     unsigned long multiple, i;
@@ -224,7 +224,7 @@
                 val_len = dv->data.val.size/8;
                 for (i=0; i<multiple; i++) {
                     if (output_value(&dv->data.val, *bufp, val_len,
-                                     (unsigned long)(*bufp-bufp_orig), bc, 1,
+                                     (unsigned long)(*bufp-bufstart), bc, 1,
                                      d))
                         return 1;
                     *bufp += val_len;
@@ -480,6 +480,14 @@
     return retval;
 }
 
+yasm_value *
+yasm_dv_get_value(yasm_dataval *dv)
+{
+    if (dv->type != DV_VALUE)
+        return NULL;
+    return &dv->data.val;
+}
+
 void
 yasm_dv_set_multiple(yasm_dataval *dv, yasm_expr *e)
 {

yasm-1.1.0.tar.gz/libyasm/bc-incbin.c -> yasm-1.2.0.tar.gz/libyasm/bc-incbin.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-incbin.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -58,7 +57,8 @@
 static void bc_incbin_finalize(yasm_bytecode *bc, yasm_bytecode *prev_bc);
 static int bc_incbin_calc_len(yasm_bytecode *bc, yasm_bc_add_span_func add_span,
                               void *add_span_data);
-static int bc_incbin_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_incbin_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                             unsigned char *bufstart, void *d,
                              yasm_output_value_func output_value,
                              /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -195,7 +195,8 @@
 }
 
 static int
-bc_incbin_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_incbin_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                  unsigned char *bufstart, void *d,
                   yasm_output_value_func output_value,
                   /*@unused@*/ yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/libyasm/bc-org.c -> yasm-1.2.0.tar.gz/libyasm/bc-org.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-org.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -52,7 +51,8 @@
 static int bc_org_expand(yasm_bytecode *bc, int span, long old_val,
                          long new_val, /*@out@*/ long *neg_thres,
                          /*@out@*/ long *pos_thres);
-static int bc_org_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_org_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                          unsigned char *bufstart, void *d,
                           yasm_output_value_func output_value,
                           /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -120,7 +120,8 @@
 }
 
 static int
-bc_org_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_org_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+               unsigned char *bufstart, void *d,
                yasm_output_value_func output_value,
                /*@unused@*/ yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/libyasm/bc-reserve.c -> yasm-1.2.0.tar.gz/libyasm/bc-reserve.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bc-reserve.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -50,7 +49,8 @@
 static int bc_reserve_calc_len(yasm_bytecode *bc,
                                yasm_bc_add_span_func add_span,
                                void *add_span_data);
-static int bc_reserve_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+static int bc_reserve_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                              unsigned char *bufstart, void *d,
                               yasm_output_value_func output_value,
                               /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -114,7 +114,8 @@
 }
 
 static int
-bc_reserve_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+bc_reserve_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                   unsigned char *bufstart, void *d,
                    yasm_output_value_func output_value,
                    /*@unused@*/ yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/libyasm/bitvect.c -> yasm-1.2.0.tar.gz/libyasm/bitvect.c Changed

yasm-1.1.0.tar.gz/libyasm/bitvect.h -> yasm-1.2.0.tar.gz/libyasm/bitvect.h Changed

yasm-1.1.0.tar.gz/libyasm/bytecode.c -> yasm-1.2.0.tar.gz/libyasm/bytecode.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: bytecode.c 2233 2009-10-31 21:45:55Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -73,7 +72,8 @@
 }
 
 int
-yasm_bc_tobytes_common(yasm_bytecode *bc, unsigned char **bufp, void *d,
+yasm_bc_tobytes_common(yasm_bytecode *bc, unsigned char **buf,
+                       unsigned char *bufstart, void *d,
                        yasm_output_value_func output_value,
                        /*@null@*/ yasm_output_reloc_func output_reloc)
 {
@@ -305,6 +305,7 @@
     /*@sets *buf@*/
 {
     /*@only@*/ /*@null@*/ unsigned char *mybuf = NULL;
+    unsigned char *bufstart;
     unsigned char *origbuf, *destbuf;
     long i;
     int error = 0;
@@ -329,6 +330,7 @@
         destbuf = mybuf;
     } else
         destbuf = buf;
+    bufstart = destbuf;
 
     *bufsize = bc->len*bc->mult_int;
 
@@ -336,7 +338,7 @@
         yasm_internal_error(N_("got empty bytecode in bc_tobytes"));
     else for (i=0; i<bc->mult_int; i++) {
         origbuf = destbuf;
-        error = bc->callback->tobytes(bc, &destbuf, d, output_value,
+        error = bc->callback->tobytes(bc, &destbuf, bufstart, d, output_value,
                                       output_reloc);
 
         if (!error && ((unsigned long)(destbuf - origbuf) != bc->len))

yasm-1.1.0.tar.gz/libyasm/bytecode.h -> yasm-1.2.0.tar.gz/libyasm/bytecode.h Changed

@@ -2,10 +2,6 @@
  * \file libyasm/bytecode.h
  * \brief YASM bytecode interface.
  *
- * \rcs
- * $Id: bytecode.h 2130 2008-10-07 05:38:11Z peter $
- * \endrcs
- *
  * \license
  *  Copyright (C) 2001-2007  Peter Johnson
  *
@@ -147,6 +143,8 @@
      *                      passed-in buf matches the bytecode length
      *                      (it's okay not to do this if an error
      *                      indication is returned)
+     * \param bufstart      For calculating the correct offset parameter for
+     *                      the \a output_value calls: *bufp - bufstart.
      * \param d             data to pass to each call to
      *                      output_value/output_reloc
      * \param output_value  function to call to convert values into their byte
@@ -158,7 +156,8 @@
      *       preferable if calling this function twice would result in the
      *       same output.
      */
-    int (*tobytes) (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    int (*tobytes) (yasm_bytecode *bc, unsigned char **bufp,
+                    unsigned char *bufstart, void *d,
                     yasm_output_value_func output_value,
                     /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -277,7 +276,7 @@
  */
 YASM_LIB_DECL
 int yasm_bc_tobytes_common
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -575,6 +574,12 @@
                                                        (unsigned long)(l))
 #endif
 
+/** Get the underlying value of a data value.
+ * \param dv    data value
+ * \return Value, or null if non-value (e.g. string or raw).
+ */
+yasm_value *yasm_dv_get_value(yasm_dataval *dv);
+
 /** Set multiple field of a data value.
  * A data value can be repeated a number of times when output.  This function
  * sets that multiple.

yasm-1.1.0.tar.gz/libyasm/compat-queue.h -> yasm-1.2.0.tar.gz/libyasm/compat-queue.h Changed

yasm-1.1.0.tar.gz/libyasm/coretype.h -> yasm-1.2.0.tar.gz/libyasm/coretype.h Changed

yasm-1.1.0.tar.gz/libyasm/dbgfmt.h -> yasm-1.2.0.tar.gz/libyasm/dbgfmt.h Changed

yasm-1.1.0.tar.gz/libyasm/errwarn.c -> yasm-1.2.0.tar.gz/libyasm/errwarn.c Changed

yasm-1.1.0.tar.gz/libyasm/errwarn.h -> yasm-1.2.0.tar.gz/libyasm/errwarn.h Changed

yasm-1.1.0.tar.gz/libyasm/expr.c -> yasm-1.2.0.tar.gz/libyasm/expr.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: expr.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -535,7 +534,7 @@
  * NOTE: Really designed to only be used by expr_level_op().
  */
 static int
-expr_simplify_identity(yasm_expr *e, int numterms, int int_term,
+expr_simplify_identity(yasm_expr *e, int numterms, int *int_term,
                        int simplify_reg_mul)
 {
     int i;
@@ -547,26 +546,27 @@
     save_numterms = e->numterms;
     e->numterms = numterms;
     if (simplify_reg_mul || e->op != YASM_EXPR_MUL
-        || !yasm_intnum_is_pos1(e->terms[int_term].data.intn)
+        || !yasm_intnum_is_pos1(e->terms[*int_term].data.intn)
         || !yasm_expr__contains(e, YASM_EXPR_REG)) {
         /* Check for simple identities that delete the intnum.
          * Don't delete if the intnum is the only thing in the expn.
          */
-        if ((int_term == 0 && numterms > 1 &&
+        if ((*int_term == 0 && numterms > 1 &&
              expr_can_destroy_int_left(e->op, e->terms[0].data.intn)) ||
-            (int_term > 0 &&
-             expr_can_destroy_int_right(e->op, e->terms[int_term].data.intn))) {
+            (*int_term > 0 &&
+             expr_can_destroy_int_right(e->op,
+                                        e->terms[*int_term].data.intn))) {
             /* Delete the intnum */
-            yasm_intnum_destroy(e->terms[int_term].data.intn);
+            yasm_intnum_destroy(e->terms[*int_term].data.intn);
 
             /* Slide everything to its right over by 1 */
-            if (int_term != numterms-1) /* if it wasn't last.. */
-                memmove(&e->terms[int_term], &e->terms[int_term+1],
-                        (numterms-1-int_term)*sizeof(yasm_expr__item));
+            if (*int_term != numterms-1) /* if it wasn't last.. */
+                memmove(&e->terms[*int_term], &e->terms[*int_term+1],
+                        (numterms-1-*int_term)*sizeof(yasm_expr__item));
 
             /* Update numterms */
             numterms--;
-            int_term = -1;      /* no longer an int term */
+            *int_term = -1;     /* no longer an int term */
         }
     }
     e->numterms = save_numterms;
@@ -574,23 +574,23 @@
     /* Check for simple identites that delete everything BUT the intnum.
      * Don't bother if the intnum is the only thing in the expn.
      */
-    if (numterms > 1 && int_term != -1 &&
-        expr_is_constant(e->op, e->terms[int_term].data.intn)) {
+    if (numterms > 1 && *int_term != -1 &&
+        expr_is_constant(e->op, e->terms[*int_term].data.intn)) {
         /* Loop through, deleting everything but the integer term */
         for (i=0; i<e->numterms; i++)
-            if (i != int_term)
+            if (i != *int_term)
                 expr_delete_term(&e->terms[i], 1);
 
         /* Move integer term to the first term (if not already there) */
-        if (int_term != 0)
-            e->terms[0] = e->terms[int_term];   /* structure copy */
+        if (*int_term != 0)
+            e->terms[0] = e->terms[*int_term];  /* structure copy */
 
         /* Set numterms to 1 */
         numterms = 1;
     }
 
     /* Compute NOT, NEG, and LNOT on single intnum. */
-    if (numterms == 1 && int_term == 0 &&
+    if (numterms == 1 && *int_term == 0 &&
         (e->op == YASM_EXPR_NOT || e->op == YASM_EXPR_NEG ||
          e->op == YASM_EXPR_LNOT))
         yasm_intnum_calc(e->terms[0].data.intn, e->op, NULL);
@@ -698,7 +698,7 @@
             int new_fold_numterms;
             /* Simplify identities and make IDENT if possible. */
             new_fold_numterms =
-                expr_simplify_identity(e, fold_numterms, first_int_term,
+                expr_simplify_identity(e, fold_numterms, &first_int_term,
                                        simplify_reg_mul);
             level_numterms -= fold_numterms-new_fold_numterms;
             fold_numterms = new_fold_numterms;
@@ -789,7 +789,7 @@
     /* Simplify identities, make IDENT if possible, and save to e->numterms. */
     if (simplify_ident && first_int_term != -1) {
         e->numterms = expr_simplify_identity(e, level_numterms,
-                                             first_int_term, simplify_reg_mul);
+                                             &first_int_term, simplify_reg_mul);
     } else {
         e->numterms = level_numterms;
         if (level_numterms == 1)

yasm-1.1.0.tar.gz/libyasm/expr.h -> yasm-1.2.0.tar.gz/libyasm/expr.h Changed

yasm-1.1.0.tar.gz/libyasm/file.c -> yasm-1.2.0.tar.gz/libyasm/file.c Changed

yasm-1.1.0.tar.gz/libyasm/file.h -> yasm-1.2.0.tar.gz/libyasm/file.h Changed

yasm-1.1.0.tar.gz/libyasm/floatnum.c -> yasm-1.2.0.tar.gz/libyasm/floatnum.c Changed

yasm-1.1.0.tar.gz/libyasm/floatnum.h -> yasm-1.2.0.tar.gz/libyasm/floatnum.h Changed

yasm-1.1.0.tar.gz/libyasm/genmodule.c -> yasm-1.2.0.tar.gz/libyasm/genmodule.c Changed

yasm-1.1.0.tar.gz/libyasm/hamt.c -> yasm-1.2.0.tar.gz/libyasm/hamt.c Changed

yasm-1.1.0.tar.gz/libyasm/hamt.h -> yasm-1.2.0.tar.gz/libyasm/hamt.h Changed

yasm-1.1.0.tar.gz/libyasm/insn.c -> yasm-1.2.0.tar.gz/libyasm/insn.c Changed

yasm-1.1.0.tar.gz/libyasm/insn.h -> yasm-1.2.0.tar.gz/libyasm/insn.h Changed

yasm-1.1.0.tar.gz/libyasm/intnum.c -> yasm-1.2.0.tar.gz/libyasm/intnum.c Changed

yasm-1.1.0.tar.gz/libyasm/intnum.h -> yasm-1.2.0.tar.gz/libyasm/intnum.h Changed

yasm-1.1.0.tar.gz/libyasm/inttree.c -> yasm-1.2.0.tar.gz/libyasm/inttree.c Changed

yasm-1.1.0.tar.gz/libyasm/inttree.h -> yasm-1.2.0.tar.gz/libyasm/inttree.h Changed

yasm-1.1.0.tar.gz/libyasm/linemap.c -> yasm-1.2.0.tar.gz/libyasm/linemap.c Changed

yasm-1.1.0.tar.gz/libyasm/linemap.h -> yasm-1.2.0.tar.gz/libyasm/linemap.h Changed

yasm-1.1.0.tar.gz/libyasm/listfmt.h -> yasm-1.2.0.tar.gz/libyasm/listfmt.h Changed

yasm-1.1.0.tar.gz/libyasm/md5.c -> yasm-1.2.0.tar.gz/libyasm/md5.c Changed

yasm-1.1.0.tar.gz/libyasm/md5.h -> yasm-1.2.0.tar.gz/libyasm/md5.h Changed

yasm-1.1.0.tar.gz/libyasm/mergesort.c -> yasm-1.2.0.tar.gz/libyasm/mergesort.c Changed

yasm-1.1.0.tar.gz/libyasm/module.h -> yasm-1.2.0.tar.gz/libyasm/module.h Changed

yasm-1.1.0.tar.gz/libyasm/module.in -> yasm-1.2.0.tar.gz/libyasm/module.in Changed

yasm-1.1.0.tar.gz/libyasm/objfmt.h -> yasm-1.2.0.tar.gz/libyasm/objfmt.h Changed

yasm-1.1.0.tar.gz/libyasm/parser.h -> yasm-1.2.0.tar.gz/libyasm/parser.h Changed

yasm-1.1.0.tar.gz/libyasm/phash.c -> yasm-1.2.0.tar.gz/libyasm/phash.c Changed

yasm-1.1.0.tar.gz/libyasm/phash.h -> yasm-1.2.0.tar.gz/libyasm/phash.h Changed

yasm-1.1.0.tar.gz/libyasm/preproc.h -> yasm-1.2.0.tar.gz/libyasm/preproc.h Changed

yasm-1.1.0.tar.gz/libyasm/section.c -> yasm-1.2.0.tar.gz/libyasm/section.c Changed

yasm-1.1.0.tar.gz/libyasm/section.h -> yasm-1.2.0.tar.gz/libyasm/section.h Changed

yasm-1.1.0.tar.gz/libyasm/strcasecmp.c -> yasm-1.2.0.tar.gz/libyasm/strcasecmp.c Changed

yasm-1.1.0.tar.gz/libyasm/strsep.c -> yasm-1.2.0.tar.gz/libyasm/strsep.c Changed

yasm-1.1.0.tar.gz/libyasm/symrec.c -> yasm-1.2.0.tar.gz/libyasm/symrec.c Changed

yasm-1.1.0.tar.gz/libyasm/symrec.h -> yasm-1.2.0.tar.gz/libyasm/symrec.h Changed

yasm-1.1.0.tar.gz/libyasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/libyasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/libyasm/tests/bitvect_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/bitvect_test.c Changed

yasm-1.1.0.tar.gz/libyasm/tests/combpath_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/combpath_test.c Changed

yasm-1.2.0.tar.gz/libyasm/tests/expr-simplify-identity.asm Added

yasm-1.2.0.tar.gz/libyasm/tests/expr-simplify-identity.hex Added

yasm-1.1.0.tar.gz/libyasm/tests/floatnum_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/floatnum_test.c Changed

yasm-1.1.0.tar.gz/libyasm/tests/leb128_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/leb128_test.c Changed

yasm-1.1.0.tar.gz/libyasm/tests/libyasm_test.sh -> yasm-1.2.0.tar.gz/libyasm/tests/libyasm_test.sh Changed

yasm-1.1.0.tar.gz/libyasm/tests/splitpath_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/splitpath_test.c Changed

yasm-1.1.0.tar.gz/libyasm/tests/uncstring_test.c -> yasm-1.2.0.tar.gz/libyasm/tests/uncstring_test.c Changed

yasm-1.1.0.tar.gz/libyasm/valparam.c -> yasm-1.2.0.tar.gz/libyasm/valparam.c Changed

yasm-1.1.0.tar.gz/libyasm/valparam.h -> yasm-1.2.0.tar.gz/libyasm/valparam.h Changed

yasm-1.1.0.tar.gz/libyasm/value.c -> yasm-1.2.0.tar.gz/libyasm/value.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "util.h"
-/*@unused@*/ RCSID("$Id: value.c 2220 2009-07-24 19:01:35Z peter $");
 
 #include "libyasm-stdint.h"
 #include "coretype.h"
@@ -453,10 +452,17 @@
         yasm_value_initialize(value, NULL, size);
         return 0;
     }
+    yasm_value_initialize(value, e, size);
+    return yasm_value_finalize(value, precbc);
+}
 
-    yasm_value_initialize(value,
-                          yasm_expr__level_tree(e, 1, 1, 0, 0, NULL, NULL),
-                          size);
+int
+yasm_value_finalize(yasm_value *value, yasm_bytecode *precbc)
+{
+    if (!value->abs)
+        return 0;
+
+    value->abs = yasm_expr__level_tree(value->abs, 1, 1, 0, 0, NULL, NULL);
 
     /* quit early if there was an issue in simplify() */
     if (yasm_error_occurred())
@@ -549,13 +555,6 @@
     return 0;
 }
 
-int
-yasm_value_finalize(yasm_value *value, yasm_bytecode *precbc)
-{
-    unsigned int valsize = value->size;
-    return yasm_value_finalize_expr(value, value->abs, precbc, valsize);
-}
-
 yasm_intnum *
 yasm_value_get_intnum(yasm_value *value, yasm_bytecode *bc, int calc_bc_dist)
 {

yasm-1.1.0.tar.gz/libyasm/value.h -> yasm-1.2.0.tar.gz/libyasm/value.h Changed

yasm-1.1.0.tar.gz/libyasm/xmalloc.c -> yasm-1.2.0.tar.gz/libyasm/xmalloc.c Changed

yasm-1.1.0.tar.gz/libyasm/xstrdup.c -> yasm-1.2.0.tar.gz/libyasm/xstrdup.c Changed

yasm-1.1.0.tar.gz/m4/cython.m4 -> yasm-1.2.0.tar.gz/m4/cython.m4 Changed

yasm-1.1.0.tar.gz/modules/Makefile.inc -> yasm-1.2.0.tar.gz/modules/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/lc3b/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/lc3barch.c -> yasm-1.2.0.tar.gz/modules/arch/lc3b/lc3barch.c Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/lc3barch.h -> yasm-1.2.0.tar.gz/modules/arch/lc3b/lc3barch.h Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/lc3bbc.c -> yasm-1.2.0.tar.gz/modules/arch/lc3b/lc3bbc.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: lc3bbc.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -44,6 +43,7 @@
                                long new_val, /*@out@*/ long *neg_thres,
                                /*@out@*/ long *pos_thres);
 static int lc3b_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                                unsigned char *bufstart,
                                 void *d, yasm_output_value_func output_value,
                                 /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -165,12 +165,14 @@
 }
 
 static int
-lc3b_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+lc3b_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                     unsigned char *bufstart, void *d,
                      yasm_output_value_func output_value,
                      /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     lc3b_insn *insn = (lc3b_insn *)bc->contents;
     /*@only@*/ yasm_intnum *delta;
+    unsigned long buf_off = (unsigned long)(*bufp - bufstart);
 
     /* Output opcode */
     YASM_SAVE_16_L(*bufp, insn->opcode);
@@ -181,29 +183,29 @@
             break;
         case LC3B_IMM_4:
             insn->imm.size = 4;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_5:
             insn->imm.size = 5;
             insn->imm.sign = 1;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_6_WORD:
             insn->imm.size = 6;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_6_BYTE:
             insn->imm.size = 6;
             insn->imm.sign = 1;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_8:
             insn->imm.size = 8;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_9_PC:
@@ -220,12 +222,12 @@
 
             insn->imm.size = 9;
             insn->imm.sign = 1;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         case LC3B_IMM_9:
             insn->imm.size = 9;
-            if (output_value(&insn->imm, *bufp, 2, 0, bc, 1, d))
+            if (output_value(&insn->imm, *bufp, 2, buf_off, bc, 1, d))
                 return 1;
             break;
         default:

yasm-1.1.0.tar.gz/modules/arch/lc3b/lc3bid.re -> yasm-1.2.0.tar.gz/modules/arch/lc3b/lc3bid.re Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/lc3b/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/lc3b/tests/lc3b_test.sh -> yasm-1.2.0.tar.gz/modules/arch/lc3b/tests/lc3b_test.sh Changed

yasm-1.1.0.tar.gz/modules/arch/x86/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/x86/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/x86/gen_x86_insn.py -> yasm-1.2.0.tar.gz/modules/arch/x86/gen_x86_insn.py Changed

@@ -28,13 +28,8 @@
 
 from sys import stdout, version_info
 
-rcstag = "$Id: gen_x86_insn.py 2346 2010-08-01 01:37:37Z peter $"
-try:
-    scriptname = rcstag.split()[1]
-    scriptrev = rcstag.split()[2]
-except IndexError:
-    scriptname = "gen_x86_insn.py"
-    scriptrev = "HEAD"
+scriptname = "gen_x86_insn.py"
+scriptrev = "HEAD"
 
 ordered_cpus = [
     "086", "186", "286", "386", "486", "586", "686", "K6", "Athlon", "P3",
@@ -43,7 +38,8 @@
     "FPU", "Cyrix", "AMD", "MMX", "3DNow", "SMM", "SSE", "SSE2",
     "SSE3", "SVM", "PadLock", "SSSE3", "SSE41", "SSE42", "SSE4a", "SSE5",
     "AVX", "FMA", "AES", "CLMUL", "MOVBE", "XOP", "FMA4", "F16C",
-    "FSGSBASE", "RDRAND", "XSAVEOPT", "EPTVPID", "SMX"]
+    "FSGSBASE", "RDRAND", "XSAVEOPT", "EPTVPID", "SMX", "AVX2", "BMI1",
+    "BMI2", "INVPCID", "LZCNT"]
 unordered_cpu_features = ["Priv", "Prot", "Undoc", "Obs"]
 
 # Predefined VEX prefix field values
@@ -560,11 +556,13 @@
                         keyword = name
                     else:
                         keyword = name+suffix
+                    keyword = keyword.lower()
                     if keyword in gas_insns:
                         raise ValueError("duplicate gas instruction %s" %
                                          keyword)
                     newinsn = insn.copy()
-                    newinsn.suffix = suffix
+                    if insn.suffix is None:
+                        newinsn.suffix = suffix
                     newinsn.auto_cpu("gas")
                     newinsn.auto_misc_flags("gas")
                     gas_insns[keyword] = newinsn
@@ -1131,6 +1129,10 @@
 # Push instructions
 #
 add_group("push",
+    def_opersize_64=64,
+    opcode=[0x50],
+    operands=[Operand(type="Reg", size="BITS", dest="Op0Add")])
+add_group("push",
     suffix="w",
     opersize=16,
     def_opersize_64=64,
@@ -1144,9 +1146,16 @@
     operands=[Operand(type="Reg", size=32, dest="Op0Add")])
 add_group("push",
     suffix="q",
+    only64=True,
     def_opersize_64=64,
     opcode=[0x50],
     operands=[Operand(type="Reg", size=64, dest="Op0Add")])
+
+add_group("push",
+    def_opersize_64=64,
+    opcode=[0xFF],
+    spare=6,
+    operands=[Operand(type="RM", size="BITS", dest="EA")])
 add_group("push",
     suffix="w",
     opersize=16,
@@ -1163,10 +1172,12 @@
     operands=[Operand(type="RM", size=32, dest="EA")])
 add_group("push",
     suffix="q",
+    only64=True,
     def_opersize_64=64,
     opcode=[0xFF],
     spare=6,
     operands=[Operand(type="RM", size=64, dest="EA")])
+
 add_group("push",
     cpu=["186"],
     parsers=["nasm"],
@@ -1338,6 +1349,10 @@
 # Pop instructions
 #
 add_group("pop",
+    def_opersize_64=64,
+    opcode=[0x58],
+    operands=[Operand(type="Reg", size="BITS", dest="Op0Add")])
+add_group("pop",
     suffix="w",
     opersize=16,
     def_opersize_64=64,
@@ -1351,9 +1366,15 @@
     operands=[Operand(type="Reg", size=32, dest="Op0Add")])
 add_group("pop",
     suffix="q",
+    only64=True,
     def_opersize_64=64,
     opcode=[0x58],
     operands=[Operand(type="Reg", size=64, dest="Op0Add")])
+
+add_group("pop",
+    def_opersize_64=64,
+    opcode=[0x8F],
+    operands=[Operand(type="RM", size="BITS", dest="EA")])
 add_group("pop",
     suffix="w",
     opersize=16,
@@ -1368,9 +1389,11 @@
     operands=[Operand(type="RM", size=32, dest="EA")])
 add_group("pop",
     suffix="q",
+    only64=True,
     def_opersize_64=64,
     opcode=[0x8F],
     operands=[Operand(type="RM", size=64, dest="EA")])
+
 # POP CS is debateably valid on the 8086, if obsolete and undocumented.
 # We don't include it because it's VERY unlikely it will ever be used
 # anywhere.  If someone really wants it they can db 0x0F it.
@@ -1727,7 +1750,7 @@
 add_insn("lds", "ldes", modifiers=[0xC5])
 add_insn("les", "ldes", modifiers=[0xC4])
 
-for sfx, sz in zip("wl", [16, 32]):
+for sfx, sz in zip("wlq", [16, 32, 64]):
     add_group("lfgss",
         suffix=sfx,
         cpu=["386"],
@@ -3079,8 +3102,24 @@
 #
 # Protection control
 #
-add_insn("lar", "bsfr", modifiers=[0x02], cpu=["286", "Prot"])
-add_insn("lsl", "bsfr", modifiers=[0x03], cpu=["286", "Prot"])
+for sfx, sz, sz2 in zip("wlq", [16, 32, 64], [16, 32, 32]):
+    add_group("larlsl",
+        suffix=sfx,
+        modifiers=["Op1Add"],
+        opersize=sz,
+        opcode=[0x0F, 0x00],
+        operands=[Operand(type="Reg", size=sz, dest="Spare"),
+                  Operand(type="Reg", size=sz2, dest="EA")])
+    add_group("larlsl",
+        suffix=sfx,
+        modifiers=["Op1Add"],
+        opersize=sz,
+        opcode=[0x0F, 0x00],
+        operands=[Operand(type="Reg", size=sz, dest="Spare"),
+                  Operand(type="RM", size=16, relaxed=True, dest="EA")])
+
+add_insn("lar", "larlsl", modifiers=[0x02], cpu=["286", "Prot"])
+add_insn("lsl", "larlsl", modifiers=[0x03], cpu=["286", "Prot"])
 
 add_group("arpl",
     suffix="w",
@@ -3953,44 +3992,44 @@
 add_insn("pxor",      "mmxsse2", modifiers=[0xEF])
 
 # AVX versions don't support the MMX registers
-add_insn("vpackssdw",  "xmm_xmm128", modifiers=[0x66, 0x6B, VEXL0], avx=True)
-add_insn("vpacksswb",  "xmm_xmm128", modifiers=[0x66, 0x63, VEXL0], avx=True)
-add_insn("vpackuswb",  "xmm_xmm128", modifiers=[0x66, 0x67, VEXL0], avx=True)
-add_insn("vpaddb",     "xmm_xmm128", modifiers=[0x66, 0xFC, VEXL0], avx=True)
-add_insn("vpaddw",     "xmm_xmm128", modifiers=[0x66, 0xFD, VEXL0], avx=True)
-add_insn("vpaddd",     "xmm_xmm128", modifiers=[0x66, 0xFE, VEXL0], avx=True)
-add_insn("vpaddq",     "xmm_xmm128", modifiers=[0x66, 0xD4, VEXL0], avx=True)
-add_insn("vpaddsb",    "xmm_xmm128", modifiers=[0x66, 0xEC, VEXL0], avx=True)
-add_insn("vpaddsw",    "xmm_xmm128", modifiers=[0x66, 0xED, VEXL0], avx=True)
-add_insn("vpaddusb",   "xmm_xmm128", modifiers=[0x66, 0xDC, VEXL0], avx=True)
-add_insn("vpaddusw",   "xmm_xmm128", modifiers=[0x66, 0xDD, VEXL0], avx=True)
-add_insn("vpand",      "xmm_xmm128", modifiers=[0x66, 0xDB, VEXL0], avx=True)
-add_insn("vpandn",     "xmm_xmm128", modifiers=[0x66, 0xDF, VEXL0], avx=True)
-add_insn("vpcmpeqb",   "xmm_xmm128", modifiers=[0x66, 0x74, VEXL0], avx=True)
-add_insn("vpcmpeqw",   "xmm_xmm128", modifiers=[0x66, 0x75, VEXL0], avx=True)
-add_insn("vpcmpeqd",   "xmm_xmm128", modifiers=[0x66, 0x76, VEXL0], avx=True)
-add_insn("vpcmpgtb",   "xmm_xmm128", modifiers=[0x66, 0x64, VEXL0], avx=True)
-add_insn("vpcmpgtw",   "xmm_xmm128", modifiers=[0x66, 0x65, VEXL0], avx=True)
-add_insn("vpcmpgtd",   "xmm_xmm128", modifiers=[0x66, 0x66, VEXL0], avx=True)
-add_insn("vpmaddwd",   "xmm_xmm128", modifiers=[0x66, 0xF5, VEXL0], avx=True)
-add_insn("vpmulhw",    "xmm_xmm128", modifiers=[0x66, 0xE5, VEXL0], avx=True)
-add_insn("vpmullw",    "xmm_xmm128", modifiers=[0x66, 0xD5, VEXL0], avx=True)
-add_insn("vpor",       "xmm_xmm128", modifiers=[0x66, 0xEB, VEXL0], avx=True)
-add_insn("vpsubb",     "xmm_xmm128", modifiers=[0x66, 0xF8, VEXL0], avx=True)
-add_insn("vpsubw",     "xmm_xmm128", modifiers=[0x66, 0xF9, VEXL0], avx=True)
-add_insn("vpsubd",     "xmm_xmm128", modifiers=[0x66, 0xFA, VEXL0], avx=True)
-add_insn("vpsubq",     "xmm_xmm128", modifiers=[0x66, 0xFB, VEXL0], avx=True)
-add_insn("vpsubsb",    "xmm_xmm128", modifiers=[0x66, 0xE8, VEXL0], avx=True)
-add_insn("vpsubsw",    "xmm_xmm128", modifiers=[0x66, 0xE9, VEXL0], avx=True)
-add_insn("vpsubusb",   "xmm_xmm128", modifiers=[0x66, 0xD8, VEXL0], avx=True)
-add_insn("vpsubusw",   "xmm_xmm128", modifiers=[0x66, 0xD9, VEXL0], avx=True)
-add_insn("vpunpckhbw", "xmm_xmm128", modifiers=[0x66, 0x68, VEXL0], avx=True)
-add_insn("vpunpckhwd", "xmm_xmm128", modifiers=[0x66, 0x69, VEXL0], avx=True)
-add_insn("vpunpckhdq", "xmm_xmm128", modifiers=[0x66, 0x6A, VEXL0], avx=True)
-add_insn("vpunpcklbw", "xmm_xmm128", modifiers=[0x66, 0x60, VEXL0], avx=True)
-add_insn("vpunpcklwd", "xmm_xmm128", modifiers=[0x66, 0x61, VEXL0], avx=True)
-add_insn("vpunpckldq", "xmm_xmm128", modifiers=[0x66, 0x62, VEXL0], avx=True)
-add_insn("vpxor",      "xmm_xmm128", modifiers=[0x66, 0xEF, VEXL0], avx=True)
+add_insn("vpackssdw",  "xmm_xmm128_256avx2", modifiers=[0x66, 0x6B, VEXL0], avx=True)

yasm-1.1.0.tar.gz/modules/arch/x86/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/Makefile.inc Changed

@@ -1,5 +1,3 @@
-# $Id: Makefile.inc 2339 2010-07-23 03:35:21Z peter $
-
 TESTS += modules/arch/x86/tests/x86_test.sh
 
 EXTRA_DIST += modules/arch/x86/tests/x86_test.sh
@@ -25,10 +23,16 @@
 EXTRA_DIST += modules/arch/x86/tests/avx.hex
 EXTRA_DIST += modules/arch/x86/tests/avx16.asm
 EXTRA_DIST += modules/arch/x86/tests/avx16.hex
+EXTRA_DIST += modules/arch/x86/tests/avx2.asm
+EXTRA_DIST += modules/arch/x86/tests/avx2.hex
 EXTRA_DIST += modules/arch/x86/tests/avxcc.asm
 EXTRA_DIST += modules/arch/x86/tests/avxcc.hex
 EXTRA_DIST += modules/arch/x86/tests/bittest.asm
 EXTRA_DIST += modules/arch/x86/tests/bittest.hex
+EXTRA_DIST += modules/arch/x86/tests/bmi1.asm
+EXTRA_DIST += modules/arch/x86/tests/bmi1.hex
+EXTRA_DIST += modules/arch/x86/tests/bmi2.asm
+EXTRA_DIST += modules/arch/x86/tests/bmi2.hex
 EXTRA_DIST += modules/arch/x86/tests/bswap64.asm
 EXTRA_DIST += modules/arch/x86/tests/bswap64.hex
 EXTRA_DIST += modules/arch/x86/tests/clmul.asm
@@ -79,6 +83,8 @@
 EXTRA_DIST += modules/arch/x86/tests/imm64.asm
 EXTRA_DIST += modules/arch/x86/tests/imm64.errwarn
 EXTRA_DIST += modules/arch/x86/tests/imm64.hex
+EXTRA_DIST += modules/arch/x86/tests/invpcid.asm
+EXTRA_DIST += modules/arch/x86/tests/invpcid.hex
 EXTRA_DIST += modules/arch/x86/tests/iret.asm
 EXTRA_DIST += modules/arch/x86/tests/iret.hex
 EXTRA_DIST += modules/arch/x86/tests/jmp64-1.asm
@@ -95,12 +101,18 @@
 EXTRA_DIST += modules/arch/x86/tests/jmp64-6.hex
 EXTRA_DIST += modules/arch/x86/tests/jmpfar.asm
 EXTRA_DIST += modules/arch/x86/tests/jmpfar.hex
+EXTRA_DIST += modules/arch/x86/tests/larlsl.asm
+EXTRA_DIST += modules/arch/x86/tests/larlsl.hex
 EXTRA_DIST += modules/arch/x86/tests/lds.asm
 EXTRA_DIST += modules/arch/x86/tests/lds.hex
+EXTRA_DIST += modules/arch/x86/tests/lfs64.asm
+EXTRA_DIST += modules/arch/x86/tests/lfs64.hex
 EXTRA_DIST += modules/arch/x86/tests/loopadsz.asm
 EXTRA_DIST += modules/arch/x86/tests/loopadsz.hex
 EXTRA_DIST += modules/arch/x86/tests/lsahf.asm
 EXTRA_DIST += modules/arch/x86/tests/lsahf.hex
+EXTRA_DIST += modules/arch/x86/tests/lzcnt.asm
+EXTRA_DIST += modules/arch/x86/tests/lzcnt.hex
 EXTRA_DIST += modules/arch/x86/tests/mem64-err.asm
 EXTRA_DIST += modules/arch/x86/tests/mem64-err.errwarn
 EXTRA_DIST += modules/arch/x86/tests/mem64.asm
@@ -177,6 +189,8 @@
 EXTRA_DIST += modules/arch/x86/tests/segoff-err.errwarn
 EXTRA_DIST += modules/arch/x86/tests/shift.asm
 EXTRA_DIST += modules/arch/x86/tests/shift.hex
+EXTRA_DIST += modules/arch/x86/tests/shift64.asm
+EXTRA_DIST += modules/arch/x86/tests/shift64.hex
 EXTRA_DIST += modules/arch/x86/tests/simd-1.asm
 EXTRA_DIST += modules/arch/x86/tests/simd-1.hex
 EXTRA_DIST += modules/arch/x86/tests/simd-2.asm
@@ -221,6 +235,12 @@
 EXTRA_DIST += modules/arch/x86/tests/vmx.hex
 EXTRA_DIST += modules/arch/x86/tests/vmx-err.asm
 EXTRA_DIST += modules/arch/x86/tests/vmx-err.errwarn
+EXTRA_DIST += modules/arch/x86/tests/vsib.asm
+EXTRA_DIST += modules/arch/x86/tests/vsib.hex
+EXTRA_DIST += modules/arch/x86/tests/vsib-err.asm
+EXTRA_DIST += modules/arch/x86/tests/vsib-err.errwarn
+EXTRA_DIST += modules/arch/x86/tests/vsib2-err.asm
+EXTRA_DIST += modules/arch/x86/tests/vsib2-err.errwarn
 EXTRA_DIST += modules/arch/x86/tests/x86label.asm
 EXTRA_DIST += modules/arch/x86/tests/x86label.hex
 EXTRA_DIST += modules/arch/x86/tests/xchg64.asm

yasm-1.1.0.tar.gz/modules/arch/x86/tests/avx.hex -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/avx.hex Changed

yasm-1.2.0.tar.gz/modules/arch/x86/tests/avx2.asm Added

@@ -0,0 +1,652 @@
+; Exhaustive test of AVX2 instructions
+;
+;  Copyright (C) 2011  Peter Johnson
+;
+; Redistribution and use in source and binary forms, with or without
+; modification, are permitted provided that the following conditions
+; are met:
+; 1. Redistributions of source code must retain the above copyright
+;    notice, this list of conditions and the following disclaimer.
+; 2. Redistributions in binary form must reproduce the above copyright
+;    notice, this list of conditions and the following disclaimer in the
+;    documentation and/or other materials provided with the distribution.
+;
+; THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
+; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+; ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
+; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+; POSSIBILITY OF SUCH DAMAGE.
+;
+
+[bits 64]
+
+vmpsadbw ymm1, ymm3, 3			; c4 e3 75 42 cb 03
+vmpsadbw ymm1, yword [rax], 3		; c4 e3 75 42 08 03
+vmpsadbw ymm1, ymm2, ymm3, 3		; c4 e3 6d 42 cb 03
+vmpsadbw ymm1, ymm2, yword [rax], 3	; c4 e3 6d 42 08 03
+
+vpabsb ymm1, ymm2			; c4 e2 7d 1c ca
+vpabsb ymm1, yword [rax]		; c4 e2 7d 1c 08
+
+vpabsw ymm1, ymm2			; c4 e2 7d 1d ca
+vpabsw ymm1, yword [rax]		; c4 e2 7d 1d 08
+
+vpabsd ymm1, ymm2			; c4 e2 7d 1e ca
+vpabsd ymm1, yword [rax]		; c4 e2 7d 1e 08
+
+vpacksswb ymm1, ymm3			; c5 f5 63 cb
+vpacksswb ymm1, yword [rax]		; c5 f5 63 08
+vpacksswb ymm1, ymm2, ymm3		; c5 ed 63 cb
+vpacksswb ymm1, ymm2, yword [rax]	; c5 ed 63 08
+
+vpackssdw ymm1, ymm3			; c5 f5 6b cb
+vpackssdw ymm1, yword [rax]		; c5 f5 6b 08
+vpackssdw ymm1, ymm2, ymm3		; c5 ed 6b cb
+vpackssdw ymm1, ymm2, yword [rax]	; c5 ed 6b 08
+
+vpackusdw ymm1, ymm3			; c4 e2 75 2b cb
+vpackusdw ymm1, yword [rax]		; c4 e2 75 2b 08
+vpackusdw ymm1, ymm2, ymm3		; c4 e2 6d 2b cb
+vpackusdw ymm1, ymm2, yword [rax]	; c4 e2 6d 2b 08
+
+vpackuswb ymm1, ymm3			; c5 f5 67 cb
+vpackuswb ymm1, yword [rax]		; c5 f5 67 08
+vpackuswb ymm1, ymm2, ymm3		; c5 ed 67 cb
+vpackuswb ymm1, ymm2, yword [rax]	; c5 ed 67 08
+
+vpaddb ymm1, ymm3			; c5 f5 fc cb
+vpaddb ymm1, yword [rax]		; c5 f5 fc 08
+vpaddb ymm1, ymm2, ymm3			; c5 ed fc cb
+vpaddb ymm1, ymm2, yword [rax]		; c5 ed fc 08
+
+vpaddw ymm1, ymm3			; c5 f5 fd cb
+vpaddw ymm1, yword [rax]		; c5 f5 fd 08
+vpaddw ymm1, ymm2, ymm3			; c5 ed fd cb
+vpaddw ymm1, ymm2, yword [rax]		; c5 ed fd 08
+
+vpaddd ymm1, ymm3			; c5 f5 fe cb
+vpaddd ymm1, yword [rax]		; c5 f5 fe 08
+vpaddd ymm1, ymm2, ymm3			; c5 ed fe cb
+vpaddd ymm1, ymm2, yword [rax]		; c5 ed fe 08
+
+vpaddq ymm1, ymm3			; c5 f5 d4 cb
+vpaddq ymm1, yword [rax]		; c5 f5 d4 08
+vpaddq ymm1, ymm2, ymm3			; c5 ed d4 cb
+vpaddq ymm1, ymm2, yword [rax]		; c5 ed d4 08
+
+vpaddsb ymm1, ymm3			; c5 f5 ec cb
+vpaddsb ymm1, yword [rax]		; c5 f5 ec 08
+vpaddsb ymm1, ymm2, ymm3		; c5 ed ec cb
+vpaddsb ymm1, ymm2, yword [rax]		; c5 ed ec 08
+
+vpaddsw ymm1, ymm3			; c5 f5 ed cb
+vpaddsw ymm1, yword [rax]		; c5 f5 ed 08
+vpaddsw ymm1, ymm2, ymm3		; c5 ed ed cb
+vpaddsw ymm1, ymm2, yword [rax]		; c5 ed ed 08
+
+vpaddusb ymm1, ymm3			; c5 f5 dc cb
+vpaddusb ymm1, yword [rax]		; c5 f5 dc 08
+vpaddusb ymm1, ymm2, ymm3		; c5 ed dc cb
+vpaddusb ymm1, ymm2, yword [rax]	; c5 ed dc 08
+
+vpaddusw ymm1, ymm3			; c5 f5 dd cb
+vpaddusw ymm1, yword [rax]		; c5 f5 dd 08
+vpaddusw ymm1, ymm2, ymm3		; c5 ed dd cb
+vpaddusw ymm1, ymm2, yword [rax]	; c5 ed dd 08
+
+vpalignr ymm1, ymm2, ymm3, 3		; c4 e3 6d 0f cb 03
+vpalignr ymm1, ymm2, yword [rax], 3	; c4 e3 6d 0f 08 03
+
+vpand ymm1, ymm3			; c5 f5 db cb
+vpand ymm1, yword [rax]			; c5 f5 db 08
+vpand ymm1, ymm2, ymm3			; c5 ed db cb
+vpand ymm1, ymm2, yword [rax]		; c5 ed db 08
+
+vpandn ymm1, ymm3			; c5 f5 df cb
+vpandn ymm1, yword [rax]		; c5 f5 df 08
+vpandn ymm1, ymm2, ymm3			; c5 ed df cb
+vpandn ymm1, ymm2, yword [rax]		; c5 ed df 08
+
+vpavgb ymm1, ymm3			; c5 f5 e0 cb
+vpavgb ymm1, yword [rax]		; c5 f5 e0 08
+vpavgb ymm1, ymm2, ymm3			; c5 ed e0 cb
+vpavgb ymm1, ymm2, yword [rax]		; c5 ed e0 08
+
+vpavgw ymm1, ymm3			; c5 f5 e3 cb
+vpavgw ymm1, yword [rax]		; c5 f5 e3 08
+vpavgw ymm1, ymm2, ymm3			; c5 ed e3 cb
+vpavgw ymm1, ymm2, yword [rax]		; c5 ed e3 08
+
+vpblendvb ymm1, ymm2, ymm3, ymm4	; c4 e3 6d 4c cb 40
+vpblendvb ymm1, ymm2, yword [rax], ymm4	; c4 e3 6d 4c 08 40
+
+vpblendw ymm1, ymm3, 3			; c4 e3 75 0e cb 03
+vpblendw ymm1, yword [rax], 3		; c4 e3 75 0e 08 03
+vpblendw ymm1, ymm2, ymm3, 3		; c4 e3 6d 0e cb 03
+vpblendw ymm1, ymm2, yword [rax], 3	; c4 e3 6d 0e 08 03
+
+vpcmpeqb ymm1, ymm3			; c5 f5 74 cb
+vpcmpeqb ymm1, yword [rax]		; c5 f5 74 08
+vpcmpeqb ymm1, ymm2, ymm3		; c5 ed 74 cb
+vpcmpeqb ymm1, ymm2, yword [rax]	; c5 ed 74 08
+
+vpcmpeqw ymm1, ymm3			; c5 f5 75 cb
+vpcmpeqw ymm1, yword [rax]		; c5 f5 75 08
+vpcmpeqw ymm1, ymm2, ymm3		; c5 ed 75 cb
+vpcmpeqw ymm1, ymm2, yword [rax]	; c5 ed 75 08
+
+vpcmpeqd ymm1, ymm3			; c5 f5 76 cb
+vpcmpeqd ymm1, yword [rax]		; c5 f5 76 08
+vpcmpeqd ymm1, ymm2, ymm3		; c5 ed 76 cb
+vpcmpeqd ymm1, ymm2, yword [rax]	; c5 ed 76 08
+
+vpcmpeqq ymm1, ymm3			; c4 e2 75 29 cb
+vpcmpeqq ymm1, yword [rax]		; c4 e2 75 29 08
+vpcmpeqq ymm1, ymm2, ymm3		; c4 e2 6d 29 cb
+vpcmpeqq ymm1, ymm2, yword [rax]	; c4 e2 6d 29 08
+
+vpcmpgtb ymm1, ymm3			; c5 f5 64 cb
+vpcmpgtb ymm1, yword [rax]		; c5 f5 64 08
+vpcmpgtb ymm1, ymm2, ymm3		; c5 ed 64 cb
+vpcmpgtb ymm1, ymm2, yword [rax]	; c5 ed 64 08
+
+vpcmpgtw ymm1, ymm3			; c5 f5 65 cb
+vpcmpgtw ymm1, yword [rax]		; c5 f5 65 08
+vpcmpgtw ymm1, ymm2, ymm3		; c5 ed 65 cb
+vpcmpgtw ymm1, ymm2, yword [rax]	; c5 ed 65 08
+
+vpcmpgtd ymm1, ymm3			; c5 f5 66 cb
+vpcmpgtd ymm1, yword [rax]		; c5 f5 66 08
+vpcmpgtd ymm1, ymm2, ymm3		; c5 ed 66 cb
+vpcmpgtd ymm1, ymm2, yword [rax]	; c5 ed 66 08
+
+vpcmpgtq ymm1, ymm3			; c4 e2 75 37 cb
+vpcmpgtq ymm1, yword [rax]		; c4 e2 75 37 08
+vpcmpgtq ymm1, ymm2, ymm3		; c4 e2 6d 37 cb
+vpcmpgtq ymm1, ymm2, yword [rax]	; c4 e2 6d 37 08
+
+vphaddw ymm1, ymm3			; c4 e2 75 01 cb
+vphaddw ymm1, yword [rax]		; c4 e2 75 01 08
+vphaddw ymm1, ymm2, ymm3		; c4 e2 6d 01 cb
+vphaddw ymm1, ymm2, yword [rax]		; c4 e2 6d 01 08
+
+vphaddd ymm1, ymm3			; c4 e2 75 02 cb
+vphaddd ymm1, yword [rax]		; c4 e2 75 02 08
+vphaddd ymm1, ymm2, ymm3		; c4 e2 6d 02 cb
+vphaddd ymm1, ymm2, yword [rax]		; c4 e2 6d 02 08
+
+vphaddsw ymm1, ymm3			; c4 e2 75 03 cb
+vphaddsw ymm1, yword [rax]		; c4 e2 75 03 08
+vphaddsw ymm1, ymm2, ymm3		; c4 e2 6d 03 cb
+vphaddsw ymm1, ymm2, yword [rax]	; c4 e2 6d 03 08
+
+vphsubw ymm1, ymm3			; c4 e2 75 05 cb
+vphsubw ymm1, yword [rax]		; c4 e2 75 05 08
+vphsubw ymm1, ymm2, ymm3		; c4 e2 6d 05 cb
+vphsubw ymm1, ymm2, yword [rax]		; c4 e2 6d 05 08
+
+vphsubd ymm1, ymm3			; c4 e2 75 06 cb
+vphsubd ymm1, yword [rax]		; c4 e2 75 06 08
+vphsubd ymm1, ymm2, ymm3		; c4 e2 6d 06 cb
+vphsubd ymm1, ymm2, yword [rax]		; c4 e2 6d 06 08
+
+vphsubsw ymm1, ymm3			; c4 e2 75 07 cb

yasm-1.2.0.tar.gz/modules/arch/x86/tests/avx2.hex Added

@@ -0,0 +1,2297 @@
+c4 
+e3 
+75 
+42 
+cb 
+03 
+c4 
+e3 
+75 
+42 
+08 
+03 
+c4 
+e3 
+6d 
+42 
+cb 
+03 
+c4 
+e3 
+6d 
+42 
+08 
+03 
+c4 
+e2 
+7d 
+1c 
+ca 
+c4 
+e2 
+7d 
+1c 
+08 
+c4 
+e2 
+7d 
+1d 
+ca 
+c4 
+e2 
+7d 
+1d 
+08 
+c4 
+e2 
+7d 
+1e 
+ca 
+c4 
+e2 
+7d 
+1e 
+08 
+c5 
+f5 
+63 
+cb 
+c5 
+f5 
+63 
+08 
+c5 
+ed 
+63 
+cb 
+c5 
+ed 
+63 
+08 
+c5 
+f5 
+6b 
+cb 
+c5 
+f5 
+6b 
+08 
+c5 
+ed 
+6b 
+cb 
+c5 
+ed 
+6b 
+08 
+c4 
+e2 
+75 
+2b 
+cb 
+c4 
+e2 
+75 
+2b 
+08 
+c4 
+e2 
+6d 
+2b 
+cb 
+c4 
+e2 
+6d 
+2b 
+08 
+c5 
+f5 
+67 
+cb 
+c5 
+f5 
+67 
+08 
+c5 
+ed 
+67 
+cb 
+c5 
+ed 
+67 
+08 
+c5 
+f5 
+fc 
+cb 
+c5 
+f5 
+fc 
+08 
+c5 
+ed 
+fc 
+cb 
+c5 
+ed 
+fc 
+08 
+c5 
+f5 
+fd 
+cb 
+c5 
+f5 
+fd 
+08 
+c5 
+ed 
+fd 
+cb 
+c5 
+ed 
+fd 
+08 
+c5 
+f5 
+fe 
+cb 
+c5 
+f5 
+fe 
+08 
+c5 
+ed 
+fe 
+cb 
+c5 
+ed 
+fe 
+08 
+c5 
+f5 
+d4 
+cb 
+c5 
+f5 
+d4 
+08 
+c5 
+ed 
+d4 
+cb 
+c5 
+ed 
+d4 
+08 
+c5 
+f5 
+ec 
+cb 
+c5 
+f5 
+ec 
+08 
+c5 
+ed 
+ec 
+cb 
+c5

yasm-1.2.0.tar.gz/modules/arch/x86/tests/bmi1.asm Added

@@ -0,0 +1,32 @@
+[bits 64]
+andn eax, ebx, ecx	; c4 e2 60 f2 c1
+andn eax, ebx, [0]	; c4 e2 60 f2 04 25 00 00 00 00
+andn rax, rbx, rcx	; c4 e2 e0 f2 c1
+andn rax, rbx, [0]	; c4 e2 e0 f2 04 25 00 00 00 00
+
+bextr eax, ebx, ecx	; c4 e2 70 f7 c3
+bextr eax, [0], ecx	; c4 e2 70 f7 04 25 00 00 00 00
+bextr rax, rbx, rcx	; c4 e2 f0 f7 c3
+bextr rax, [0], rcx	; c4 e2 f0 f7 04 25 00 00 00 00
+
+blsi eax, ecx		; c4 e2 78 f3 d9
+blsi eax, [0]		; c4 e2 78 f3 1c 25 00 00 00 00
+blsi rax, rcx		; c4 e2 f8 f3 d9
+blsi rax, [0]		; c4 e2 f8 f3 1c 25 00 00 00 00
+
+blsmsk eax, ecx		; c4 e2 78 f3 d1
+blsmsk eax, [0]		; c4 e2 78 f3 14 25 00 00 00 00
+blsmsk rax, rcx		; c4 e2 f8 f3 d1
+blsmsk rax, [0]		; c4 e2 f8 f3 14 25 00 00 00 00
+
+blsr eax, ecx		; c4 e2 78 f3 c9
+blsr eax, [0]		; c4 e2 78 f3 0c 25 00 00 00 00
+blsr rax, rcx		; c4 e2 f8 f3 c9
+blsr rax, [0]		; c4 e2 f8 f3 0c 25 00 00 00 00
+
+tzcnt ax, bx		; 66 f3 0f bc c3
+tzcnt ax, [0]		; 66 f3 0f bc 04 25 00 00 00 00
+tzcnt eax, ebx		; f3 0f bc c3
+tzcnt eax, [0]		; f3 0f bc 04 25 00 00 00 00
+tzcnt rax, rbx		; f3 48 0f bc c3
+tzcnt rax, [0]		; f3 48 0f bc 04 25 00 00 00 00

yasm-1.2.0.tar.gz/modules/arch/x86/tests/bmi1.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/bmi2.asm Added

@@ -0,0 +1,40 @@
+[bits 64]
+bzhi eax, ebx, ecx	; c4 e2 70 f5 c3
+bzhi eax, [0], ecx	; c4 e2 70 f5 04 25 00 00 00 00
+bzhi rax, rbx, rcx	; c4 e2 f0 f5 c3
+bzhi rax, [0], rcx	; c4 e2 f0 f5 04 25 00 00 00 00
+
+mulx eax, ebx, ecx	; c4 e2 63 f6 c1
+mulx eax, ebx, [0]	; c4 e2 63 f6 04 25 00 00 00 00
+mulx rax, rbx, rcx	; c4 e2 e3 f6 c1
+mulx rax, rbx, [0]	; c4 e2 e3 f6 04 25 00 00 00 00
+
+pdep eax, ebx, ecx	; c4 e2 63 f5 c1
+pdep eax, ebx, [0]	; c4 e2 63 f5 04 25 00 00 00 00
+pdep rax, rbx, rcx	; c4 e2 e3 f5 c1
+pdep rax, rbx, [0]	; c4 e2 e3 f5 04 25 00 00 00 00
+
+pext eax, ebx, ecx	; c4 e2 62 f5 c1
+pext eax, ebx, [0]	; c4 e2 62 f5 04 25 00 00 00 00
+pext rax, rbx, rcx	; c4 e2 e2 f5 c1
+pext rax, rbx, [0]	; c4 e2 e2 f5 04 25 00 00 00 00
+
+rorx eax, ebx, 3	; c4 e3 7b f0 c3 03
+rorx eax, [0], 3	; c4 e3 7b f0 04 25 00 00 00 00 03
+rorx rax, rbx, 3	; c4 e3 fb f0 c3 03
+rorx rax, [0], 3	; c4 e3 fb f0 04 25 00 00 00 00 03
+
+sarx eax, ebx, ecx	; c4 e2 72 f7 c3
+sarx eax, [0], ecx	; c4 e2 72 f7 04 25 00 00 00 00
+sarx rax, rbx, rcx	; c4 e2 f2 f7 c3
+sarx rax, [0], rcx	; c4 e2 f2 f7 04 25 00 00 00 00
+
+shlx eax, ebx, ecx	; c4 e2 71 f7 c3
+shlx eax, [0], ecx	; c4 e2 71 f7 04 25 00 00 00 00
+shlx rax, rbx, rcx	; c4 e2 f1 f7 c3
+shlx rax, [0], rcx	; c4 e2 f1 f7 04 25 00 00 00 00
+
+shrx eax, ebx, ecx	; c4 e2 73 f7 c3
+shrx eax, [0], ecx	; c4 e2 73 f7 04 25 00 00 00 00
+shrx rax, rbx, rcx	; c4 e2 f3 f7 c3
+shrx rax, [0], rcx	; c4 e2 f3 f7 04 25 00 00 00 00

yasm-1.2.0.tar.gz/modules/arch/x86/tests/bmi2.hex Added

@@ -0,0 +1,244 @@
+c4 
+e2 
+70 
+f5 
+c3 
+c4 
+e2 
+70 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f0 
+f5 
+c3 
+c4 
+e2 
+f0 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+63 
+f6 
+c1 
+c4 
+e2 
+63 
+f6 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+e3 
+f6 
+c1 
+c4 
+e2 
+e3 
+f6 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+63 
+f5 
+c1 
+c4 
+e2 
+63 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+e3 
+f5 
+c1 
+c4 
+e2 
+e3 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+62 
+f5 
+c1 
+c4 
+e2 
+62 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+e2 
+f5 
+c1 
+c4 
+e2 
+e2 
+f5 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e3 
+7b 
+f0 
+c3 
+03 
+c4 
+e3 
+7b 
+f0 
+04 
+25 
+00 
+00 
+00 
+00 
+03 
+c4 
+e3 
+fb 
+f0 
+c3 
+03 
+c4 
+e3 
+fb 
+f0 
+04 
+25 
+00 
+00 
+00 
+00 
+03 
+c4 
+e2 
+72 
+f7 
+c3 
+c4 
+e2 
+72 
+f7 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f2 
+f7 
+c3 
+c4 
+e2 
+f2 
+f7 
+04 
+25 
+00 
+00 
+00 
+00 
+c4 
+e2 
+71 
+f7 
+c3 
+c4 
+e2 
+71 
+f7 
+04 
+25 
+00 
+00 
+00 
+00

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas32/Makefile.inc Changed

yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas32/gas-pop.asm Added

@@ -0,0 +1,50 @@
+.code64
+push %cx		# out: 66 51
+pop %cx			# out: 66 59
+push %rcx		# out: 51
+pop %rcx		# out: 59
+pushw %cx		# out: 66 51
+popw %cx		# out: 66 59
+pushq %rcx		# out: 51
+popq %rcx		# out: 59
+
+push -24(%rcx)		# out: ff 71 e8
+pop -24(%rcx)		# out: 8f 41 e8
+pushw -24(%rcx)		# out: 66 ff 71 e8
+popw -24(%rcx)		# out: 66 8f 41 e8
+pushq -24(%rcx)		# out: ff 71 e8
+popq -24(%rcx)		# out: 8f 41 e8
+
+.code32
+push %cx		# out: 66 51
+pop %cx			# out: 66 59
+push %ecx		# out: 51
+pop %ecx		# out: 59
+pushw %cx		# out: 66 51
+popw %cx		# out: 66 59
+pushl %ecx		# out: 51
+popl %ecx		# out: 59
+
+push -24(%ecx)		# out: ff 71 e8
+pop -24(%ecx)		# out: 8f 41 e8
+pushw -24(%ecx)		# out: 66 ff 71 e8
+popw -24(%ecx)		# out: 66 8f 41 e8
+pushl -24(%ecx)		# out: ff 71 e8
+popl -24(%ecx)		# out: 8f 41 e8
+
+.code16
+push %cx		# out: 51
+pop %cx			# out: 59
+push %ecx		# out: 66 51
+pop %ecx		# out: 66 59
+pushw %cx		# out: 51
+popw %cx		# out: 59
+pushl %ecx		# out: 66 51
+popl %ecx		# out: 66 59
+
+push -24(%bp)		# out: ff 76 e8
+pop -24(%bp)		# out: 8f 46 e8
+pushw -24(%bp)		# out: ff 76 e8
+popw -24(%bp)		# out: 8f 46 e8
+pushl -24(%bp)		# out: 66 ff 76 e8
+popl -24(%bp)		# out: 66 8f 46 e8

yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas32/gas-pop.hex Added

@@ -0,0 +1,456 @@
+7f 
+45 
+4c 
+46 
+01 
+01 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+03 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+34 
+00 
+00 
+00 
+00 
+00 
+28 
+00 
+05 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+66 
+51 
+66 
+59 
+51 
+59 
+66 
+51 
+66 
+59 
+51 
+59 
+ff 
+71 
+e8 
+8f 
+41 
+e8 
+66 
+ff 
+71 
+e8 
+66 
+8f 
+41 
+e8 
+ff 
+71 
+e8 
+8f 
+41 
+e8 
+66 
+51 
+66 
+59 
+51 
+59 
+66 
+51 
+66 
+59 
+51 
+59 
+ff 
+71 
+e8 
+8f 
+41 
+e8 
+66 
+ff 
+71 
+e8 
+66 
+8f 
+41 
+e8 
+ff 
+71 
+e8 
+8f 
+41 
+e8 
+51 
+59 
+66 
+51 
+66 
+59 
+51 
+59 
+66 
+51 
+66 
+59 
+ff 
+76 
+e8 
+8f 
+46 
+e8 
+ff 
+76 
+e8 
+8f 
+46 
+e8 
+66 
+ff 
+76 
+e8 
+66 
+8f 
+46 
+e8 
+00 
+2e 
+74 
+65 
+78 
+74 
+00 
+2e 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+2e 
+73 
+79 
+6d 
+74 
+61 
+62 
+00 
+2e 
+73 
+68 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+00 
+00 
+00 
+00 
+2d 
+00

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas32/x86_gas32_test.sh -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas32/x86_gas32_test.sh Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/gas-moreinsn.hex -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/gas-moreinsn.hex Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/gas-movsxs.asm -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/gas-movsxs.asm Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/gas-movsxs.hex -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/gas-movsxs.hex Changed

yasm-1.1.0.tar.gz/modules/arch/x86/tests/gas64/x86_gas64_test.sh -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/gas64/x86_gas64_test.sh Changed

yasm-1.2.0.tar.gz/modules/arch/x86/tests/invpcid.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/invpcid.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/larlsl.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/larlsl.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/lfs64.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/lfs64.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/lzcnt.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/lzcnt.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/shift64.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/shift64.hex Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib-err.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib-err.errwarn Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib.asm Added

@@ -0,0 +1,114 @@
+[bits 16]
+; test promotion to 32-bit address size
+vpgatherdq xmm0,[xmm0],xmm0		; 67 c4 e2 f9 90 04 05 00 00 00 00
+vpgatherqq ymm0,[ymm0],ymm0		; 67 c4 e2 fd 91 04 05 00 00 00 00
+
+[bits 32]
+; test promotion from base to index
+vpgatherdq xmm0,[xmm0],xmm0		; c4 e2 f9 90 04 05 00 00 00 00
+vpgatherqq ymm0,[ymm0],ymm0		; c4 e2 fd 91 04 05 00 00 00 00
+
+; various combinations
+vpgatherdq xmm0,[ecx+xmm5],xmm0		; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ecx+ymm5],ymm0		; c4 e2 fd 91 04 29
+vpgatherdq xmm0,[ebp+xmm5],xmm0		; c4 e2 f9 90 44 2d 00
+vpgatherqq ymm0,[ebp+ymm5],ymm0		; c4 e2 fd 91 44 2d 00
+ 
+vpgatherdq xmm0,[xmm5+ecx],xmm0		; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ymm5+ecx],ymm0		; c4 e2 fd 91 04 29
+vpgatherdq xmm0,[xmm5+ebp],xmm0		; c4 e2 f9 90 44 2d 00
+vpgatherqq ymm0,[ymm5+ebp],ymm0		; c4 e2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[ecx+xmm5*1],xmm0	; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ecx+ymm5*1],ymm0	; c4 e2 fd 91 04 29
+vpgatherdq xmm0,[ebp+xmm5*1],xmm0	; c4 e2 f9 90 44 2d 00
+vpgatherqq ymm0,[ebp+ymm5*1],ymm0	; c4 e2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[xmm5+ecx*1],xmm0	; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ymm5+ecx*1],ymm0	; c4 e2 fd 91 04 29
+vpgatherdq xmm0,[xmm5+ebp*1],xmm0	; c4 e2 f9 90 44 2d 00
+vpgatherqq ymm0,[ymm5+ebp*1],ymm0	; c4 e2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[nosplit 12345678h + xmm5*1],xmm0; c4 e2 f9 90 04 2d 78 56 34 12
+vpgatherqq ymm0,[nosplit 12345678h + ymm5*1],ymm0; c4 e2 fd 91 04 2d 78 56 34 12
+
+vpgatherdq xmm0,[byte ecx + 12 + xmm5*2],xmm0	; c4 e2 f9 90 44 69 0c
+vpgatherqq ymm0,[byte ecx + 12 + ymm5*2],ymm0	; c4 e2 fd 91 44 69 0c
+vpgatherdq xmm0,[byte ebp + 12 + xmm5*2],xmm0	; c4 e2 f9 90 44 6d 0c
+vpgatherqq ymm0,[byte ebp + 12 + ymm5*2],ymm0	; c4 e2 fd 91 44 6d 0c
+
+vpgatherdq xmm0,[dword ecx + 12 + xmm5*4],xmm0	; c4 e2 f9 90 84 a9 0c 00 00 00
+vpgatherqq ymm0,[dword ecx + 12 + ymm5*4],ymm0	; c4 e2 fd 91 84 a9 0c 00 00 00
+vpgatherdq xmm0,[dword ebp + 12 + xmm5*4],xmm0	; c4 e2 f9 90 84 ad 0c 00 00 00
+vpgatherqq ymm0,[dword ebp + 12 + ymm5*4],ymm0	; c4 e2 fd 91 84 ad 0c 00 00 00
+
+vpgatherdq xmm0,[ecx + 12345678h + xmm5*4],xmm0	; c4 e2 f9 90 84 a9 78 56 34 12
+vpgatherqq ymm0,[ecx + 12345678h + ymm5*4],ymm0	; c4 e2 fd 91 84 a9 78 56 34 12
+vpgatherdq xmm0,[ebp + 12345678h + xmm5*4],xmm0	; c4 e2 f9 90 84 ad 78 56 34 12
+vpgatherqq ymm0,[ebp + 12345678h + ymm5*4],ymm0	; c4 e2 fd 91 84 ad 78 56 34 12
+
+vpgatherdq xmm0,[ecx + 12 + xmm5*4],xmm0	; c4 e2 f9 90 44 a9 0c
+vpgatherqq ymm0,[ecx + 12 + ymm5*4],ymm0	; c4 e2 fd 91 44 a9 0c
+vpgatherdq xmm0,[ebp + 12 + xmm5*4],xmm0	; c4 e2 f9 90 44 ad 0c
+vpgatherqq ymm0,[ebp + 12 + ymm5*4],ymm0	; c4 e2 fd 91 44 ad 0c
+
+vpgatherdq xmm0,[dword 12 + xmm5*8],xmm0	; c4 e2 f9 90 04 ed 0c 00 00 00
+vpgatherqq ymm0,[dword 12 + ymm5*8],ymm0	; c4 e2 fd 91 04 ed 0c 00 00 00
+vpgatherdq xmm0,[12 + xmm5*8],xmm0		; c4 e2 f9 90 04 ed 0c 00 00 00
+vpgatherqq ymm0,[12 + ymm5*8],ymm0		; c4 e2 fd 91 04 ed 0c 00 00 00
+
+[bits 64]
+; test promotion from base to index
+vpgatherdq xmm0,[xmm0],xmm0		; c4 e2 f9 90 04 05 00 00 00 00
+vpgatherqq ymm0,[ymm0],ymm0		; c4 e2 fd 91 04 05 00 00 00 00
+
+; various combinations
+vpgatherdq xmm0,[rcx+xmm5],xmm0		; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[rcx+ymm13],ymm0	; c4 a2 fd 91 04 29
+vpgatherdq xmm0,[r13+xmm13],xmm0	; c4 82 f9 90 44 2d 00
+vpgatherqq ymm0,[r13+ymm5],ymm0		; c4 c2 fd 91 44 2d 00
+ 
+vpgatherdq xmm0,[xmm5+rcx],xmm0		; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ymm13+rcx],ymm0	; c4 a2 fd 91 04 29
+vpgatherdq xmm0,[xmm13+r13],xmm0	; c4 82 f9 90 44 2d 00
+vpgatherqq ymm0,[ymm5+r13],ymm0		; c4 c2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[rcx+xmm5*1],xmm0	; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[rcx+ymm13*1],ymm0	; c4 a2 fd 91 04 29
+vpgatherdq xmm0,[r13+xmm13*1],xmm0	; c4 82 f9 90 44 2d 00
+vpgatherqq ymm0,[r13+ymm5*1],ymm0	; c4 c2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[xmm5+rcx*1],xmm0	; c4 e2 f9 90 04 29
+vpgatherqq ymm0,[ymm13+rcx*1],ymm0	; c4 a2 fd 91 04 29
+vpgatherdq xmm0,[xmm13+r13*1],xmm0	; c4 82 f9 90 44 2d 00
+vpgatherqq ymm0,[ymm5+r13*1],ymm0	; c4 c2 fd 91 44 2d 00
+
+vpgatherdq xmm0,[nosplit 12345678h + xmm5*1],xmm0; c4 e2 f9 90 04 2d 78 56 34 12
+vpgatherqq ymm0,[nosplit 12345678h + ymm5*1],ymm0; c4 e2 fd 91 04 2d 78 56 34 12
+
+vpgatherdq xmm0,[byte rcx + 12 + xmm5*2],xmm0	; c4 e2 f9 90 44 69 0c
+vpgatherqq ymm0,[byte rcx + 12 + ymm13*2],ymm0	; c4 a2 fd 91 44 69 0c
+vpgatherdq xmm0,[byte r13 + 12 + xmm13*2],xmm0	; c4 82 f9 90 44 6d 0c
+vpgatherqq ymm0,[byte r13 + 12 + ymm5*2],ymm0	; c4 c2 fd 91 44 6d 0c
+
+vpgatherdq xmm0,[dword rcx + 12 + xmm5*4],xmm0	; c4 e2 f9 90 84 a9 0c 00 00 00
+vpgatherqq ymm0,[dword rcx + 12 + ymm13*4],ymm0	; c4 a2 fd 91 84 a9 0c 00 00 00
+vpgatherdq xmm0,[dword r13 + 12 + xmm13*4],xmm0	; c4 82 f9 90 84 ad 0c 00 00 00
+vpgatherqq ymm0,[dword r13 + 12 + ymm5*4],ymm0	; c4 c2 fd 91 84 ad 0c 00 00 00
+
+vpgatherdq xmm0,[rcx + 12345678h + xmm5*4],xmm0	; c4 e2 f9 90 84 a9 78 56 34 12
+vpgatherqq ymm0,[rcx + 12345678h + ymm13*4],ymm0; c4 a2 fd 91 84 a9 78 56 34 12
+vpgatherdq xmm0,[r13 + 12345678h + xmm13*4],xmm0; c4 82 f9 90 84 ad 78 56 34 12
+vpgatherqq ymm0,[r13 + 12345678h + ymm5*4],ymm0	; c4 c2 fd 91 84 ad 78 56 34 12
+
+vpgatherdq xmm0,[rcx + 12 + xmm5*4],xmm0	; c4 e2 f9 90 44 a9 0c
+vpgatherqq ymm0,[rcx + 12 + ymm13*4],ymm0	; c4 a2 fd 91 44 a9 0c
+vpgatherdq xmm0,[r13 + 12 + xmm13*4],xmm0	; c4 82 f9 90 44 ad 0c
+vpgatherqq ymm0,[r13 + 12 + ymm5*4],ymm0	; c4 c2 fd 91 44 ad 0c
+
+vpgatherdq xmm0,[dword 12 + xmm5*8],xmm0	; c4 e2 f9 90 04 ed 0c 00 00 00
+vpgatherqq ymm0,[dword 12 + ymm13*8],ymm0	; c4 a2 fd 91 04 ed 0c 00 00 00
+vpgatherdq xmm0,[12 + xmm13*8],xmm0		; c4 a2 f9 90 04 ed 0c 00 00 00
+vpgatherqq ymm0,[12 + ymm5*8],ymm0		; c4 e2 fd 91 04 ed 0c 00 00 00
+
+

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib.hex Added

@@ -0,0 +1,662 @@
+67 
+c4 
+e2 
+f9 
+90 
+04 
+05 
+00 
+00 
+00 
+00 
+67 
+c4 
+e2 
+fd 
+91 
+04 
+05 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+05 
+00 
+00 
+00 
+00 
+c4 
+e2 
+fd 
+91 
+04 
+05 
+00 
+00 
+00 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+e2 
+fd 
+91 
+04 
+29 
+c4 
+e2 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+e2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+e2 
+fd 
+91 
+04 
+29 
+c4 
+e2 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+e2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+e2 
+fd 
+91 
+04 
+29 
+c4 
+e2 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+e2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+29 
+c4 
+e2 
+fd 
+91 
+04 
+29 
+c4 
+e2 
+f9 
+90 
+44 
+2d 
+00 
+c4 
+e2 
+fd 
+91 
+44 
+2d 
+00 
+c4 
+e2 
+f9 
+90 
+04 
+2d 
+78 
+56 
+34 
+12 
+c4 
+e2 
+fd 
+91 
+04 
+2d 
+78 
+56 
+34 
+12 
+c4 
+e2 
+f9 
+90 
+44 
+69 
+0c 
+c4 
+e2 
+fd 
+91 
+44 
+69 
+0c 
+c4 
+e2 
+f9 
+90 
+44 
+6d 
+0c 
+c4 
+e2 
+fd 
+91 
+44 
+6d 
+0c 
+c4 
+e2 
+f9 
+90 
+84

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib2-err.asm Added

yasm-1.2.0.tar.gz/modules/arch/x86/tests/vsib2-err.errwarn Added

yasm-1.1.0.tar.gz/modules/arch/x86/tests/x86_test.sh -> yasm-1.2.0.tar.gz/modules/arch/x86/tests/x86_test.sh Changed

yasm-1.1.0.tar.gz/modules/arch/x86/x86arch.c -> yasm-1.2.0.tar.gz/modules/arch/x86/x86arch.c Changed

yasm-1.1.0.tar.gz/modules/arch/x86/x86arch.h -> yasm-1.2.0.tar.gz/modules/arch/x86/x86arch.h Changed

@@ -1,4 +1,4 @@
-/* $Id: x86arch.h 2346 2010-08-01 01:37:37Z peter $
+/*
  * x86 Architecture header file
  *
  *  Copyright (C) 2001-2007  Peter Johnson
@@ -78,6 +78,11 @@
 #define CPU_XSAVEOPT 44     /* Intel XSAVEOPT instruction */
 #define CPU_EPTVPID 45      /* Intel INVEPT, INVVPID instructions */
 #define CPU_SMX     46      /* Intel SMX instruction (GETSEC) */
+#define CPU_AVX2    47      /* Intel AVX2 instructions */
+#define CPU_BMI1    48      /* Intel BMI1 instructions */
+#define CPU_BMI2    49      /* Intel BMI2 instructions */
+#define CPU_INVPCID 50      /* Intel INVPCID instruction */
+#define CPU_LZCNT   51      /* Intel LZCNT instruction */
 
 enum x86_parser_type {
     X86_PARSER_NASM = 0,
@@ -172,6 +177,9 @@
 typedef struct x86_effaddr {
     yasm_effaddr ea;            /* base structure */
 
+    /* VSIB uses the normal SIB byte, but this flag enables it. */
+    unsigned char vsib_mode;    /* 0 if not, 1 if XMM, 2 if YMM */
+
     /* How the spare (register) bits in Mod/RM are handled:
      * Even if valid_modrm=0, the spare bits are still valid (don't overwrite!)
      * They're set in bytecode_create_insn().

yasm-1.1.0.tar.gz/modules/arch/x86/x86bc.c -> yasm-1.2.0.tar.gz/modules/arch/x86/x86bc.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: x86bc.c 2279 2010-01-19 07:57:43Z peter $");
 
 #include <libyasm.h>
 
@@ -44,6 +43,7 @@
                               long new_val, /*@out@*/ long *neg_thres,
                               /*@out@*/ long *pos_thres);
 static int x86_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                               unsigned char *bufstart,
                                void *d, yasm_output_value_func output_value,
                                /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -56,6 +56,7 @@
                              long new_val, /*@out@*/ long *neg_thres,
                              /*@out@*/ long *pos_thres);
 static int x86_bc_jmp_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                              unsigned char *bufstart,
                               void *d, yasm_output_value_func output_value,
                               /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -66,7 +67,7 @@
                                   yasm_bc_add_span_func add_span,
                                   void *add_span_data);
 static int x86_bc_jmpfar_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -189,6 +190,7 @@
     x86_ea->ea.pc_rel = 0;
     x86_ea->ea.not_pc_rel = 0;
     x86_ea->ea.data_len = 0;
+    x86_ea->vsib_mode = 0;
     x86_ea->modrm = 0;
     x86_ea->valid_modrm = 0;
     x86_ea->need_modrm = 0;
@@ -380,6 +382,8 @@
     fprintf(f, "%*sNoSplit=%u\n", indent_level, "", (unsigned int)ea->nosplit);
     fprintf(f, "%*sSegmentOv=%02x\n", indent_level, "",
             (unsigned int)x86_ea->ea.segreg);
+    fprintf(f, "%*sVSIBMode=%u\n", indent_level, "",
+            (unsigned int)x86_ea->vsib_mode);
     fprintf(f, "%*sModRM=%03o ValidRM=%u NeedRM=%u\n", indent_level, "",
             (unsigned int)x86_ea->modrm, (unsigned int)x86_ea->valid_modrm,
             (unsigned int)x86_ea->need_modrm);
@@ -800,14 +804,14 @@
 }
 
 static int
-x86_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+x86_bc_insn_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                    unsigned char *bufstart, void *d,
                     yasm_output_value_func output_value,
                     /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     x86_insn *insn = (x86_insn *)bc->contents;
     /*@null@*/ x86_effaddr *x86_ea = (x86_effaddr *)insn->x86_ea;
     yasm_value *imm = insn->imm;
-    unsigned char *bufp_orig = *bufp;
 
     /* Prefixes */
     x86_common_tobytes(&insn->common, bufp,
@@ -874,7 +878,7 @@
                                          yasm_expr_int(delta), bc->line);
             }
             if (output_value(&x86_ea->ea.disp, *bufp, disp_len,
-                             (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                             (unsigned long)(*bufp-bufstart), bc, 1, d))
                 return 1;
             *bufp += disp_len;
         }
@@ -892,7 +896,7 @@
             imm_len = 1;
         } else
             imm_len = imm->size/8;
-        if (output_value(imm, *bufp, imm_len, (unsigned long)(*bufp-bufp_orig),
+        if (output_value(imm, *bufp, imm_len, (unsigned long)(*bufp-bufstart),
                          bc, 1, d))
             return 1;
         *bufp += imm_len;
@@ -902,14 +906,14 @@
 }
 
 static int
-x86_bc_jmp_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+x86_bc_jmp_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                   unsigned char *bufstart, void *d,
                    yasm_output_value_func output_value,
                    /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     x86_jmp *jmp = (x86_jmp *)bc->contents;
     unsigned char opersize;
     unsigned int i;
-    unsigned char *bufp_orig = *bufp;
     /*@only@*/ yasm_intnum *delta;
 
     /* Prefixes */
@@ -944,7 +948,7 @@
             jmp->target.size = 8;
             jmp->target.sign = 1;
             if (output_value(&jmp->target, *bufp, 1,
-                             (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                             (unsigned long)(*bufp-bufstart), bc, 1, d))
                 return 1;
             *bufp += 1;
             break;
@@ -976,7 +980,7 @@
             jmp->target.size = i*8;
             jmp->target.sign = 1;
             if (output_value(&jmp->target, *bufp, i,
-                             (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                             (unsigned long)(*bufp-bufstart), bc, 1, d))
                 return 1;
             *bufp += i;
             break;
@@ -989,13 +993,13 @@
 }
 
 static int
-x86_bc_jmpfar_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+x86_bc_jmpfar_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                      unsigned char *bufstart, void *d,
                       yasm_output_value_func output_value,
                       /*@unused@*/ yasm_output_reloc_func output_reloc)
 {
     x86_jmpfar *jmpfar = (x86_jmpfar *)bc->contents;
     unsigned int i;
-    unsigned char *bufp_orig = *bufp;
     unsigned char opersize;
 
     x86_common_tobytes(&jmpfar->common, bufp, 0);
@@ -1009,12 +1013,12 @@
     i = (opersize == 16) ? 2 : 4;
     jmpfar->offset.size = i*8;
     if (output_value(&jmpfar->offset, *bufp, i,
-                     (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                     (unsigned long)(*bufp-bufstart), bc, 1, d))
         return 1;
     *bufp += i;
     jmpfar->segment.size = 16;
     if (output_value(&jmpfar->segment, *bufp, 2,
-                     (unsigned long)(*bufp-bufp_orig), bc, 1, d))
+                     (unsigned long)(*bufp-bufstart), bc, 1, d))
         return 1;
     *bufp += 2;

yasm-1.1.0.tar.gz/modules/arch/x86/x86cpu.gperf -> yasm-1.2.0.tar.gz/modules/arch/x86/x86cpu.gperf Changed

yasm-1.1.0.tar.gz/modules/arch/x86/x86expr.c -> yasm-1.2.0.tar.gz/modules/arch/x86/x86expr.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: x86expr.c 2199 2009-05-10 05:24:46Z peter $");
 
 #include <libyasm.h>
 
@@ -34,6 +33,7 @@
 
 typedef struct x86_checkea_reg3264_data {
     int *regs;          /* total multiplier for each reg */
+    unsigned char vsib_mode;
     unsigned char bits;
     unsigned char addrsize;
 } x86_checkea_reg3264_data;
@@ -58,6 +58,20 @@
                 return 0;
             *regnum = (unsigned int)(ei->data.reg & 0xF);
             break;
+        case X86_XMMREG:
+            if (data->vsib_mode != 1)
+                return 0;
+            if (data->bits != 64 && (ei->data.reg & 0x8) == 0x8)
+                return 0;
+            *regnum = 17+(unsigned int)(ei->data.reg & 0xF);
+            break;
+        case X86_YMMREG:
+            if (data->vsib_mode != 2)
+                return 0;
+            if (data->bits != 64 && (ei->data.reg & 0x8) == 0x8)
+                return 0;
+            *regnum = 17+(unsigned int)(ei->data.reg & 0xF);
+            break;
         case X86_RIP:
             if (data->bits != 64)
                 return 0;
@@ -606,6 +620,11 @@
                 }
                 /*@fallthrough@*/
             default:
+                /* If SIB is required, but we're in 16-bit mode, set to 32. */
+                if (bits == 16 && x86_ea->need_sib == 1) {
+                    *addrsize = 32;
+                    break;
+                }
                 /* check for use of 16 or 32-bit registers; if none are used
                  * default to bits setting.
                  */
@@ -643,13 +662,19 @@
             REG64_R13,
             REG64_R14,
             REG64_R15,
-            REG64_RIP
+            REG64_RIP,
+            SIMDREGS
         } reg3264type;
-        int reg3264mult[17] = {0, 0, 0, 0, 0, 0, 0, 0,
-                               0, 0, 0, 0, 0, 0, 0, 0, 0};
+        int reg3264mult[33] =
+            {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+             0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
         x86_checkea_reg3264_data reg3264_data;
         int basereg = REG3264_NONE;     /* "base" register (for SIB) */
         int indexreg = REG3264_NONE;    /* "index" register (for SIB) */
+        int regcount = 17;              /* normally don't check SIMD regs */
+
+        if (x86_ea->vsib_mode != 0)
+            regcount = 33;
 
         /* We can only do 64-bit addresses in 64-bit mode. */
         if (*addrsize == 64 && bits != 64) {
@@ -665,6 +690,7 @@
         }
 
         reg3264_data.regs = reg3264mult;
+        reg3264_data.vsib_mode = x86_ea->vsib_mode;
         reg3264_data.bits = bits;
         reg3264_data.addrsize = *addrsize;
         if (x86_ea->ea.disp.abs) {
@@ -698,7 +724,7 @@
          * Also, if an indexreg hasn't been assigned, try to find one.
          * Meanwhile, check to make sure there's no negative register mults.
          */
-        for (i=0; i<17; i++) {
+        for (i=0; i<regcount; i++) {
             if (reg3264mult[i] < 0) {
                 yasm_error_set(YASM_ERROR_VALUE,
                                N_("invalid effective address"));
@@ -711,10 +737,26 @@
                 indexreg = i;
         }
 
-        /* Handle certain special cases of indexreg mults when basereg is
-         * empty.
-         */
-        if (indexreg != REG3264_NONE && basereg == REG3264_NONE)
+        if (x86_ea->vsib_mode != 0) {
+            /* For VSIB, the SIMD register needs to go into the indexreg.
+             * Also check basereg (must be a GPR if present) and indexreg
+             * (must be a SIMD register).
+             */
+            if (basereg >= SIMDREGS &&
+                (indexreg == REG3264_NONE || reg3264mult[indexreg] == 1)) {
+                int temp = basereg;
+                basereg = indexreg;
+                indexreg = temp;
+            }
+            if (basereg >= REG64_RIP || indexreg < SIMDREGS) {
+                yasm_error_set(YASM_ERROR_VALUE,
+                               N_("invalid effective address"));
+                return 1;
+            }
+        } else if (indexreg != REG3264_NONE && basereg == REG3264_NONE)
+            /* Handle certain special cases of indexreg mults when basereg is
+             * empty.
+             */
             switch (reg3264mult[indexreg]) {
                 case 1:
                     /* Only optimize this way if nosplit wasn't specified */
@@ -741,7 +783,7 @@
         /* Make sure there's no other registers than the basereg and indexreg
          * we just found.
          */
-        for (i=0; i<17; i++)
+        for (i=0; i<regcount; i++)
             if (i != basereg && i != indexreg && reg3264mult[i] != 0) {
                 yasm_error_set(YASM_ERROR_VALUE,
                                N_("invalid effective address"));
@@ -861,10 +903,17 @@
                 x86_ea->sib |= 040;
                 /* Any scale field is valid, just leave at 0. */
             else {
-                if (yasm_x86__set_rex_from_reg(rex, &low3, (unsigned int)
-                                               (X86_REG64 | indexreg), bits,
-                                               X86_REX_X))
-                    return 1;
+                if (indexreg >= SIMDREGS) {
+                    if (yasm_x86__set_rex_from_reg(rex, &low3,
+                            (unsigned int)(X86_XMMREG | (indexreg-SIMDREGS)),
+                            bits, X86_REX_X))
+                        return 1;
+                } else {
+                    if (yasm_x86__set_rex_from_reg(rex, &low3,
+                            (unsigned int)(X86_REG64 | indexreg),
+                            bits, X86_REX_X))
+                        return 1;
+                }
                 x86_ea->sib |= low3 << 3;
                 /* Set scale field, 1 case -> 0, so don't bother. */
                 switch (reg3264mult[indexreg]) {

yasm-1.1.0.tar.gz/modules/arch/x86/x86id.c -> yasm-1.2.0.tar.gz/modules/arch/x86/x86id.c Changed

@@ -26,7 +26,6 @@
  */
 #include <ctype.h>
 #include <util.h>
-RCSID("$Id: x86id.c 2279 2010-01-19 07:57:43Z peter $");
 
 #include <libyasm.h>
 #include <libyasm/phash.h>
@@ -111,7 +110,11 @@
      */
     OPT_MemrAX = 25,
     /* EAX memory operand only (EA) [special case for SVM skinit opcode] */
-    OPT_MemEAX = 26
+    OPT_MemEAX = 26,
+    /* XMM VSIB memory operand */
+    OPT_MemXMMIndex = 27,
+    /* YMM VSIB memory operand */
+    OPT_MemYMMIndex = 28
 };
 
 enum x86_operand_size {
@@ -347,6 +350,37 @@
 
 #include "x86insns.c"
 
+/* Looks for the first SIMD register match for the purposes of VSIB matching.
+ * Full legality checking is performed in EA code.
+ */
+static int
+x86_expr_contains_simd_cb(const yasm_expr__item *ei, void *d)
+{
+    int ymm = *((int *)d);
+    if (ei->type != YASM_EXPR_REG)
+        return 0;
+    switch ((x86_expritem_reg_size)(ei->data.reg & ~0xFUL)) {
+        case X86_XMMREG:
+            if (!ymm)
+                return 1;
+            break;
+        case X86_YMMREG:
+            if (ymm)
+                return 1;
+            break;
+        default:
+            break;
+    }
+    return 0;
+}
+
+static int
+x86_expr_contains_simd(const yasm_expr *e, int ymm)
+{
+    return yasm_expr__traverse_leaves_in_const(e, &ymm,
+                                               x86_expr_contains_simd_cb);
+}
+
 static void
 x86_finalize_common(x86_common *common, const x86_insn_info *info,
                     unsigned int mode_bits)
@@ -851,6 +885,16 @@
                         mismatch = 1;
                     break;
                 }
+                case OPT_MemXMMIndex:
+                    if (op->type != YASM_INSN__OPERAND_MEMORY ||
+                        !x86_expr_contains_simd(op->data.ea->disp.abs, 0))
+                        mismatch = 1;
+                    break;
+                case OPT_MemYMMIndex:
+                    if (op->type != YASM_INSN__OPERAND_MEMORY ||
+                        !x86_expr_contains_simd(op->data.ea->disp.abs, 1))
+                        mismatch = 1;
+                    break;
                 default:
                     yasm_internal_error(N_("invalid operand type"));
             }
@@ -1231,12 +1275,20 @@
                             if (info_ops[i].type == OPT_MemOffs)
                                 /* Special-case for MOV MemOffs instruction */
                                 yasm_x86__ea_set_disponly(insn->x86_ea);
-                            else if (id_insn->default_rel &&
-                                     !op->data.ea->not_pc_rel &&
-                                     op->data.ea->segreg != 0x6404 &&
-                                     op->data.ea->segreg != 0x6505 &&
-                                     !yasm_expr__contains(
-                                        op->data.ea->disp.abs, YASM_EXPR_REG))
+                            else if (info_ops[i].type == OPT_MemXMMIndex) {
+                                /* Remember VSIB mode */
+                                insn->x86_ea->vsib_mode = 1;
+                                insn->x86_ea->need_sib = 1;
+                            } else if (info_ops[i].type == OPT_MemYMMIndex) {
+                                /* Remember VSIB mode */
+                                insn->x86_ea->vsib_mode = 2;
+                                insn->x86_ea->need_sib = 1;
+                            } else if (id_insn->default_rel &&
+                                       !op->data.ea->not_pc_rel &&
+                                       op->data.ea->segreg != 0x6404 &&
+                                       op->data.ea->segreg != 0x6505 &&
+                                       !yasm_expr__contains(
+                                          op->data.ea->disp.abs, YASM_EXPR_REG))
                                 /* Enable default PC-rel if no regs and segreg
                                  * is not FS or GS.
                                  */

yasm-1.1.0.tar.gz/modules/arch/x86/x86regtmod.gperf -> yasm-1.2.0.tar.gz/modules/arch/x86/x86regtmod.gperf Changed

yasm-1.1.0.tar.gz/modules/arch/yasm_arch.xml -> yasm-1.2.0.tar.gz/modules/arch/yasm_arch.xml Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/cv-dbgfmt.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/cv-dbgfmt.c Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/cv-dbgfmt.h -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/cv-dbgfmt.h Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/cv-symline.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/cv-symline.c Changed

@@ -28,7 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: cv-symline.c 2258 2010-01-03 01:04:18Z peter $");
 
 #include <libyasm.h>
 
@@ -163,7 +162,7 @@
 static int cv8_symhead_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv8_symhead_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -173,7 +172,7 @@
 static int cv8_fileinfo_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv8_fileinfo_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -183,7 +182,7 @@
 static int cv8_lineinfo_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv8_lineinfo_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -192,7 +191,7 @@
 static int cv_sym_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int cv_sym_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -638,9 +637,12 @@
     /* add object and compile flag first */
     cv8_add_sym_objname(info.debug_symline,
                         yasm__abspath(object->obj_filename));
-    cv8_add_sym_compile(object, info.debug_symline,
-                        yasm__xstrdup(PACKAGE_NAME " " PACKAGE_INTVER "."
-                                      PACKAGE_BUILD));
+    if (getenv("YASM_TEST_SUITE"))
+        cv8_add_sym_compile(object, info.debug_symline,
+                            yasm__xstrdup("yasm HEAD"));
+    else
+        cv8_add_sym_compile(object, info.debug_symline,
+                            yasm__xstrdup(PACKAGE_STRING));
     /* then iterate through symbol table */
     yasm_symtab_traverse(object->symtab, &info, cv_generate_sym);
     cv8_set_symhead_end(head, yasm_section_bcs_last(info.debug_symline));
@@ -724,7 +726,8 @@
 }
 
 static int
-cv8_symhead_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv8_symhead_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                       unsigned char *bufstart, void *d,
                        yasm_output_value_func output_value,
                        yasm_output_reloc_func output_reloc)
 {
@@ -797,7 +800,8 @@
 }
 
 static int
-cv8_fileinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv8_fileinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -864,7 +868,8 @@
 }
 
 static int
-cv8_lineinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv8_lineinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -876,7 +881,8 @@
     cv8_lineset *ls;
 
     /* start offset and section */
-    cv_out_sym(li->sectsym, 0, bc, &buf, d, output_value);
+    cv_out_sym(li->sectsym, (unsigned long)(buf - bufstart), bc, &buf,
+               d, output_value);
 
     /* Two bytes of pad/alignment */
     YASM_WRITE_8(buf, 0);
@@ -1019,7 +1025,8 @@
 }
 
 static int
-cv_sym_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+cv_sym_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                  unsigned char *bufstart, void *d,
                   yasm_output_value_func output_value,
                   yasm_output_reloc_func output_reloc)
 {
@@ -1061,7 +1068,7 @@
                 break;
             case 'Y':
                 cv_out_sym((yasm_symrec *)cvs->args[arg++].p,
-                           (unsigned long)(buf-(*bufp)), bc, &buf, d,
+                           (unsigned long)(buf-bufstart), bc, &buf, d,
                            output_value);
                 break;
             case 'T':

yasm-1.1.0.tar.gz/modules/dbgfmts/codeview/cv-type.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/codeview/cv-type.c Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-aranges.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-aranges.c Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: dwarf2-dbgfmt.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -46,7 +45,7 @@
 static int dwarf2_head_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_head_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -248,7 +247,8 @@
 }
 
 static int
-dwarf2_head_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_head_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                       unsigned char *bufstart, void *d,
                        yasm_output_value_func output_value,
                        yasm_output_reloc_func output_reloc)
 {
@@ -288,7 +288,7 @@
                                 yasm_section_bcs_first(head->debug_ptr)),
             dbgfmt_dwarf2->sizeof_offset*8);
         output_value(&value, buf, dbgfmt_dwarf2->sizeof_offset,
-                     (unsigned long)(buf-*bufp), bc, 0, d);
+                     (unsigned long)(buf-bufstart), bc, 0, d);
         buf += dbgfmt_dwarf2->sizeof_offset;
     }

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.h -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-dbgfmt.h Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-info.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-info.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: dwarf2-info.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -197,7 +196,7 @@
 static int dwarf2_abbrev_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_abbrev_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -337,7 +336,10 @@
 
     /* producer - assembler name */
     abc->len += dwarf2_add_abbrev_attr(abbrev, DW_AT_producer, DW_FORM_string);
-    dwarf2_append_str(debug_info, PACKAGE " " VERSION);
+    if (getenv("YASM_TEST_SUITE"))
+        dwarf2_append_str(debug_info, "yasm HEAD");
+    else
+        dwarf2_append_str(debug_info, PACKAGE_STRING);
 
     /* language - no standard code for assembler, use MIPS as a substitute */
     abc->len += dwarf2_add_abbrev_attr(abbrev, DW_AT_language, DW_FORM_data2);
@@ -394,7 +396,8 @@
 }
 
 static int
-dwarf2_abbrev_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_abbrev_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                         unsigned char *bufstart, void *d,
                          yasm_output_value_func output_value,
                          yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-line.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/dwarf2-line.c Changed

@@ -28,7 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: dwarf2-line.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -77,7 +76,8 @@
 typedef enum {
     DW_LNE_end_sequence = 1,
     DW_LNE_set_address,
-    DW_LNE_define_file
+    DW_LNE_define_file,
+    DW_LNE_set_discriminator
 } dwarf_line_number_ext_op;
 
 /* Base and range for line offsets in special opcodes */
@@ -120,6 +120,7 @@
     /* extended opcode */
     dwarf_line_number_ext_op ext_opcode;
     /*@null@*/ /*@dependent@*/ yasm_symrec *ext_operand;  /* unsigned */
+    /*@null@*/ /*@dependent@*/ yasm_intnum *ext_operand_int; /* unsigned */
     unsigned long ext_operandsize;
 } dwarf2_line_op;
 
@@ -130,7 +131,7 @@
 static int dwarf2_spp_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_spp_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -140,7 +141,7 @@
 static int dwarf2_line_op_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int dwarf2_line_op_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -254,6 +255,7 @@
     line_op->operand = operand;
     line_op->ext_opcode = 0;
     line_op->ext_operand = NULL;
+    line_op->ext_operand_int = NULL;
     line_op->ext_operandsize = 0;
 
     bc = yasm_bc_create_common(&dwarf2_line_op_bc_callback, line_op, 0);
@@ -282,6 +284,31 @@
     line_op->operand = yasm_intnum_create_uint(ext_operandsize+1);
     line_op->ext_opcode = ext_opcode;
     line_op->ext_operand = ext_operand;
+    line_op->ext_operand_int = NULL;
+    line_op->ext_operandsize = ext_operandsize;
+
+    bc = yasm_bc_create_common(&dwarf2_line_op_bc_callback, line_op, 0);
+    bc->len = 2 + yasm_intnum_size_leb128(line_op->operand, 0) +
+        ext_operandsize;
+
+    yasm_dwarf2__append_bc(sect, bc);
+    return bc;
+}
+
+static yasm_bytecode *
+dwarf2_dbgfmt_append_line_ext_op_int(yasm_section *sect,
+                                     dwarf_line_number_ext_op ext_opcode,
+                                     /*@only@*/ yasm_intnum *ext_operand)
+{
+    dwarf2_line_op *line_op = yasm_xmalloc(sizeof(dwarf2_line_op));
+    unsigned long ext_operandsize = yasm_intnum_size_leb128(ext_operand, 0);
+    yasm_bytecode *bc;
+
+    line_op->opcode = DW_LNS_extended_op;
+    line_op->operand = yasm_intnum_create_uint(ext_operandsize+1);
+    line_op->ext_opcode = ext_opcode;
+    line_op->ext_operand = NULL;
+    line_op->ext_operand_int = ext_operand;
     line_op->ext_operandsize = ext_operandsize;
 
     bc = yasm_bc_create_common(&dwarf2_line_op_bc_callback, line_op, 0);
@@ -344,6 +371,11 @@
         dwarf2_dbgfmt_append_line_op(debug_line, DW_LNS_set_column,
                                      yasm_intnum_create_uint(state->column));
     }
+    if (loc->discriminator != 0) {
+        dwarf2_dbgfmt_append_line_ext_op_int(debug_line,
+            DW_LNE_set_discriminator,
+            yasm_intnum_create_uint(loc->discriminator));
+    }
 #ifdef WITH_DWARF3
     if (loc->isa_change) {
         state->isa = loc->isa;
@@ -453,12 +485,34 @@
 } dwarf2_line_bc_info;
 
 static int
+dwarf2_filename_equals(const dwarf2_filename *fn,
+                       char **dirs,
+                       const char *pathname,
+                       unsigned long dirlen,
+                       const char *filename)
+{
+    /* check directory */
+    if (fn->dir == 0) {
+        if (dirlen != 0)
+            return 0;
+    } else {
+        if (strncmp(dirs[fn->dir-1], pathname, dirlen) != 0 ||
+            dirs[fn->dir-1][dirlen] != '\0')
+            return 0;
+    }
+
+    /* check filename */
+    return strcmp(fn->filename, filename) == 0;
+}
+
+static int
 dwarf2_generate_line_bc(yasm_bytecode *bc, /*@null@*/ void *d)
 {
     dwarf2_line_bc_info *info = (dwarf2_line_bc_info *)d;
     yasm_dbgfmt_dwarf2 *dbgfmt_dwarf2 = info->dbgfmt_dwarf2;
     unsigned long i;
-    const char *filename;
+    size_t dirlen;
+    const char *pathname, *filename;
     /*@null@*/ yasm_bytecode *nextbc = yasm_bc__next(bc);
 
     if (nextbc && bc->offset == nextbc->offset)
@@ -476,15 +530,20 @@
         }
     }
 
-    yasm_linemap_lookup(info->linemap, bc->line, &filename, &info->loc.line);
+    yasm_linemap_lookup(info->linemap, bc->line, &pathname, &info->loc.line);
+    dirlen = yasm__splitpath(pathname, &filename);
+
     /* Find file index; just linear search it unless it was the last used */
     if (info->lastfile > 0
-        && strcmp(filename, dbgfmt_dwarf2->filenames[info->lastfile-1].pathname)
-           == 0)
+        && dwarf2_filename_equals(&dbgfmt_dwarf2->filenames[info->lastfile-1],
+                                  dbgfmt_dwarf2->dirs, pathname, dirlen,
+                                  filename))
         info->loc.file = info->lastfile;
     else {
         for (i=0; i<dbgfmt_dwarf2->filenames_size; i++) {
-            if (strcmp(filename, dbgfmt_dwarf2->filenames[i].pathname) == 0)
+            if (dwarf2_filename_equals(&dbgfmt_dwarf2->filenames[i],
+                                       dbgfmt_dwarf2->dirs, pathname, dirlen,
+                                       filename))
                 break;
         }
         if (i >= dbgfmt_dwarf2->filenames_size)
@@ -561,6 +620,7 @@
         bcinfo.lastfile = 0;
         bcinfo.loc.isa_change = 0;
         bcinfo.loc.column = 0;
+        bcinfo.loc.discriminator = 0;
         bcinfo.loc.is_stmt = IS_STMT_NOCHANGE;
         bcinfo.loc.basic_block = 0;
         bcinfo.loc.prologue_end = 0;
@@ -717,7 +777,8 @@
 }
 
 static int
-dwarf2_spp_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_spp_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                      unsigned char *bufstart, void *d,
                       yasm_output_value_func output_value,
                       yasm_output_reloc_func output_reloc)
 {
@@ -780,6 +841,8 @@
     dwarf2_line_op *line_op = (dwarf2_line_op *)contents;
     if (line_op->operand)
         yasm_intnum_destroy(line_op->operand);
+    if (line_op->ext_operand_int)
+        yasm_intnum_destroy(line_op->ext_operand_int);
     yasm_xfree(contents);
 }
 
@@ -799,7 +862,8 @@
 }
 
 static int
-dwarf2_line_op_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+dwarf2_line_op_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                          unsigned char *bufstart, void *d,
                           yasm_output_value_func output_value,
                           yasm_output_reloc_func output_reloc)
 {
@@ -817,9 +881,12 @@
             yasm_value_init_sym(&value, line_op->ext_operand,
                                 line_op->ext_operandsize*8);
             output_value(&value, buf, line_op->ext_operandsize,
-                         (unsigned long)(buf-*bufp), bc, 0, d);
+                         (unsigned long)(buf-bufstart), bc, 0, d);

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/Makefile.inc Changed

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64 Added

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64/Makefile.inc Added

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64/dwarf2_gen64_test.sh Added

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.asm Added

yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/gen64/dwarf64_pathname.hex Added

@@ -0,0 +1,1632 @@
+7f 
+45 
+4c 
+46 
+02 
+01 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+3e 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+60 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+0c 
+00 
+01 
+00 
+31 
+ed 
+e8 
+10 
+00 
+00 
+00 
+48 
+31 
+c0 
+48 
+89 
+c7 
+48 
+c7 
+c0 
+3c 
+00 
+00 
+00 
+0f 
+05 
+f4 
+55 
+48 
+89 
+e5 
+48 
+83 
+ec 
+20 
+48 
+83 
+ec 
+40 
+4c 
+00 
+00 
+00 
+02 
+00 
+29 
+00 
+00 
+00 
+01 
+01 
+fb 
+0e 
+0d 
+00 
+01 
+01 
+01 
+01 
+00 
+00 
+00 
+01 
+00 
+00 
+01 
+00 
+2d 
+00 
+00 
+00 
+00 
+73 
+6f 
+6d 
+65 
+5f 
+66 
+69 
+6c 
+65 
+6e 
+61 
+6d 
+65 
+00 
+00 
+00 
+00 
+00 
+04 
+02 
+00 
+09 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+2e 
+58 
+3c 
+3c 
+74 
+2e 
+20 
+20 
+3c 
+4b 
+02 
+04 
+00 
+01 
+01 
+00 
+38 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+00 
+00 
+00

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass32/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass32/dwarf2_pass32_test.sh Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass64/dwarf2_pass64_test.sh -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/pass64/dwarf2_pass64_test.sh Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/dwarf2_passwin64_test.sh -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/dwarf2_passwin64_test.sh Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/dwarfwin64_testhd.errwarn -> yasm-1.2.0.tar.gz/modules/dbgfmts/dwarf2/tests/passwin64/dwarfwin64_testhd.errwarn Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/null/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/null/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/null/null-dbgfmt.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/null/null-dbgfmt.c Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/stabs/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/stabs/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/stabs/stabs-dbgfmt.c -> yasm-1.2.0.tar.gz/modules/dbgfmts/stabs/stabs-dbgfmt.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: stabs-dbgfmt.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -119,7 +118,7 @@
 static int stabs_bc_str_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int stabs_bc_str_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -129,7 +128,7 @@
 static int stabs_bc_stab_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int stabs_bc_stab_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -405,7 +404,8 @@
 }
 
 static int
-stabs_bc_stab_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+stabs_bc_stab_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                      unsigned char *bufstart, void *d,
                       yasm_output_value_func output_value,
                       yasm_output_reloc_func output_reloc)
 {
@@ -439,7 +439,8 @@
 }
 
 static int
-stabs_bc_str_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+stabs_bc_str_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                     unsigned char *bufstart, void *d,
                      yasm_output_value_func output_value,
                      yasm_output_reloc_func output_reloc)
 {

yasm-1.1.0.tar.gz/modules/dbgfmts/stabs/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/dbgfmts/stabs/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/stabs/tests/stabs_test.sh -> yasm-1.2.0.tar.gz/modules/dbgfmts/stabs/tests/stabs_test.sh Changed

yasm-1.1.0.tar.gz/modules/dbgfmts/yasm_dbgfmts.xml -> yasm-1.2.0.tar.gz/modules/dbgfmts/yasm_dbgfmts.xml Changed

yasm-1.1.0.tar.gz/modules/listfmts/Makefile.inc -> yasm-1.2.0.tar.gz/modules/listfmts/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/listfmts/nasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/listfmts/nasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/listfmts/nasm/nasm-listfmt.c -> yasm-1.2.0.tar.gz/modules/listfmts/nasm/nasm-listfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/bin/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/bin-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/bin/bin-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/bin/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/tests/bin_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/bin/tests/bin_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/tests/multisect/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/bin/tests/multisect/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/bin/tests/multisect/bin_multi_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/bin/tests/multisect/bin_multi_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/coff/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/coff-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/coff/coff-objfmt.c Changed

@@ -26,7 +26,6 @@
  */
 #include <util.h>
 #include <time.h>
-/*@unused@*/ RCSID("$Id: coff-objfmt.c 2347 2010-08-01 17:31:12Z peter $");
 
 #include <libyasm.h>
 
@@ -183,10 +182,15 @@
 
     coff_symrec_data *filesym_data;         /* Data for .file symbol */
 
+    /* data for .def/.endef and related directives */
+    coff_symrec_data *def_sym;              /* symbol specified by .def */
+
     /* data for win64 proc_frame and related directives */
     unsigned long proc_frame;   /* Line number of start of proc, or 0 */
     unsigned long done_prolog;  /* Line number of end of prologue, or 0 */
     /*@null@*/ coff_unwind_info *unwind;        /* Unwind info */
+
+    yasm_symrec *ssym_imagebase;            /* ..imagebase symbol for win64 */
 } yasm_objfmt_coff;
 
 typedef struct coff_objfmt_output_info {
@@ -227,7 +231,7 @@
 static int win32_sxdata_bc_calc_len
     (yasm_bytecode *bc, yasm_bc_add_span_func add_span, void *add_span_data);
 static int win32_sxdata_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -294,6 +298,7 @@
     objfmt_coff->proc_frame = 0;
     objfmt_coff->done_prolog = 0;
     objfmt_coff->unwind = NULL;
+    objfmt_coff->ssym_imagebase = NULL;
 
     return objfmt_coff;
 }
@@ -380,6 +385,8 @@
         objfmt_coff->objfmt.module = &yasm_win64_LTX_objfmt;
         objfmt_coff->win32 = 1;
         objfmt_coff->win64 = 1;
+        objfmt_coff->ssym_imagebase =
+            yasm_symtab_define_label(object->symtab, "..imagebase", NULL, 0, 0);
     }
     return (yasm_objfmt *)objfmt_coff;
 }
@@ -487,14 +494,18 @@
         /*@dependent@*/ /*@null@*/ yasm_symrec *sym = value->rel;
         unsigned long addr;
         coff_reloc *reloc;
+        int nobase = info->csd->flags2 & COFF_FLAG_NOBASE;
 
         /* Sometimes we want the relocation to be generated against one
          * symbol but the value generated correspond to a different symbol.
          * This is done through (sym being referenced) WRT (sym used for
          * reloc).  Note both syms need to be in the same section!
          */
-        if (value->wrt) {
+        if (value->wrt && value->wrt == objfmt_coff->ssym_imagebase)
+            nobase = 1;
+        else if (value->wrt) {
             /*@dependent@*/ /*@null@*/ yasm_bytecode *rel_precbc, *wrt_precbc;
+
             if (!yasm_symrec_get_label(sym, &rel_precbc)
                 || !yasm_symrec_get_label(value->wrt, &wrt_precbc)) {
                 yasm_error_set(YASM_ERROR_TOO_COMPLEX,
@@ -569,8 +580,8 @@
                 intn_minus = bc->offset;
         }
 
-        if (value->seg_of || value->section_rel) {
-            /* Segment or section-relative generation; zero value. */
+        if (value->seg_of) {
+            /* Segment generation; zero value. */
             intn_val = 0;
             intn_minus = 0;
         }
@@ -642,13 +653,13 @@
                 yasm_internal_error(N_("coff objfmt: unrecognized machine"));
         } else {
             if (objfmt_coff->machine == COFF_MACHINE_I386) {
-                if (info->csd->flags2 & COFF_FLAG_NOBASE)
+                if (nobase)
                     reloc->type = COFF_RELOC_I386_ADDR32NB;
                 else
                     reloc->type = COFF_RELOC_I386_ADDR32;
             } else if (objfmt_coff->machine == COFF_MACHINE_AMD64) {
                 if (valsize == 32) {
-                    if (info->csd->flags2 & COFF_FLAG_NOBASE)
+                    if (nobase)
                         reloc->type = COFF_RELOC_AMD64_ADDR32NB;
                     else
                         reloc->type = COFF_RELOC_AMD64_ADDR32;
@@ -1512,6 +1523,7 @@
     } else if (objfmt_coff->win64 && strcmp(sectname, ".xdata") == 0) {
         data.flags = COFF_STYP_DATA | COFF_STYP_READ;
         align = 8;
+        data.flags2 = COFF_FLAG_NOBASE;
     } else if (objfmt_coff->win32 && strcmp(sectname, ".sxdata") == 0) {
         data.flags = COFF_STYP_INFO;
     } else if (strcmp(sectname, ".comment") == 0) {
@@ -1594,6 +1606,17 @@
     return NULL;
 }
 
+static /*@observer@*/ /*@null@*/ yasm_symrec *
+win64_objfmt_get_special_sym(yasm_object *object, const char *name,
+                             const char *parser)
+{
+    if (yasm__strcasecmp(name, "imagebase") == 0) {
+        yasm_objfmt_coff *objfmt_coff = (yasm_objfmt_coff *)object->objfmt;
+        return objfmt_coff->ssym_imagebase;
+    }
+    return NULL;
+}
+
 static void
 coff_section_data_destroy(void *data)
 {
@@ -1758,7 +1781,8 @@
 }
 
 static int
-win32_sxdata_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+win32_sxdata_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -1840,6 +1864,131 @@
 }
 
 static void
+dir_secrel32(yasm_object *object, yasm_valparamhead *valparams,
+             yasm_valparamhead *objext_valparams, unsigned long line)
+{
+    yasm_datavalhead dvs;
+    yasm_valparam *vp;
+
+    if (!object->cur_section) {
+        yasm_error_set(YASM_ERROR_SYNTAX,
+                       N_(".secrel32 can only be used inside of a section"));
+        return;
+    }
+
+    vp = yasm_vps_first(valparams);
+    yasm_dvs_initialize(&dvs);
+    do {
+        yasm_expr *e = yasm_vp_expr(vp, object->symtab, line);
+        yasm_dataval *dv;
+        if (!e) {
+            yasm_error_set(YASM_ERROR_VALUE,
+                           N_(".secrel32 requires expressions"));
+            yasm_dvs_delete(&dvs);
+            return;
+        }
+        dv = yasm_dv_create_expr(e);
+        yasm_dv_get_value(dv)->section_rel = 1;
+        yasm_dvs_append(&dvs, dv);
+    } while ((vp = yasm_vps_next(vp)));
+
+    yasm_section_bcs_append(object->cur_section,
+        yasm_bc_create_data(&dvs, 4, 0, object->arch, line));
+}
+
+static void
+dir_def(yasm_object *object, yasm_valparamhead *valparams,
+        yasm_valparamhead *objext_valparams, unsigned long line)
+{
+    yasm_objfmt_coff *objfmt_coff = (yasm_objfmt_coff *)object->objfmt;
+    yasm_valparam *vp;
+    const char *symname;
+    yasm_symrec *sym;
+    coff_symrec_data *sym_data;
+
+    if (objfmt_coff->def_sym) {
+        yasm_warn_set(YASM_WARN_GENERAL,
+                      N_(".def pseudo-op used inside of .def/.endef; ignored"));
+        return;
+    }
+
+    vp = yasm_vps_first(valparams);
+    symname = yasm_vp_id(vp);
+    if (!symname) {
+        yasm_error_set(YASM_ERROR_SYNTAX,
+                       N_("argument to SAFESEH must be symbol name"));
+        return;
+    }
+
+    sym = yasm_symtab_use(object->symtab, symname, line);
+    sym_data = yasm_symrec_get_data(sym, &coff_symrec_data_cb);
+    if (!sym_data) {
+        sym_data = coff_objfmt_sym_set_data(sym, COFF_SCL_NULL, 0,
+                                            COFF_SYMTAB_AUX_NONE);
+    }
+    objfmt_coff->def_sym = sym_data;

yasm-1.1.0.tar.gz/modules/objfmts/coff/coff-objfmt.h -> yasm-1.2.0.tar.gz/modules/objfmts/coff/coff-objfmt.h Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/coff/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/tests/coff_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/coff/tests/coff_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/tests/x86id.asm -> yasm-1.2.0.tar.gz/modules/objfmts/coff/tests/x86id.asm Changed

yasm-1.1.0.tar.gz/modules/objfmts/coff/win64-except.c -> yasm-1.2.0.tar.gz/modules/objfmts/coff/win64-except.c Changed

@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-/*@unused@*/ RCSID("$Id: win64-except.c 2130 2008-10-07 05:38:11Z peter $");
 
 #include <libyasm.h>
 
@@ -48,7 +47,7 @@
                                   long new_val, /*@out@*/ long *neg_thres,
                                   /*@out@*/ long *pos_thres);
 static int win64_uwinfo_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -63,7 +62,7 @@
                                   long new_val, /*@out@*/ long *neg_thres,
                                   /*@out@*/ long *pos_thres);
 static int win64_uwcode_bc_tobytes
-    (yasm_bytecode *bc, unsigned char **bufp, void *d,
+    (yasm_bytecode *bc, unsigned char **bufp, unsigned char *bufstart, void *d,
      yasm_output_value_func output_value,
      /*@null@*/ yasm_output_reloc_func output_reloc);
 
@@ -279,7 +278,8 @@
 }
 
 static int
-win64_uwinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+win64_uwinfo_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -295,12 +295,12 @@
         YASM_WRITE_8(buf, 1);
 
     /* Size of prolog */
-    output_value(&info->prolog_size, buf, 1, (unsigned long)(buf-*bufp),
+    output_value(&info->prolog_size, buf, 1, (unsigned long)(buf-bufstart),
                  bc, 1, d);
     buf += 1;
 
     /* Count of codes */
-    output_value(&info->codes_count, buf, 1, (unsigned long)(buf-*bufp),
+    output_value(&info->codes_count, buf, 1, (unsigned long)(buf-bufstart),
                  bc, 1, d);
     buf += 1;
 
@@ -459,7 +459,8 @@
 }
 
 static int
-win64_uwcode_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp, void *d,
+win64_uwcode_bc_tobytes(yasm_bytecode *bc, unsigned char **bufp,
+                        unsigned char *bufstart, void *d,
                         yasm_output_value_func output_value,
                         yasm_output_reloc_func output_reloc)
 {
@@ -476,7 +477,7 @@
         yasm_expr_create(YASM_EXPR_SUB, yasm_expr_sym(code->loc),
                          yasm_expr_sym(code->proc), bc->line),
         8);
-    output_value(&val, buf, 1, (unsigned long)(buf-*bufp), bc, 1, d);
+    output_value(&val, buf, 1, (unsigned long)(buf-bufstart), bc, 1, d);
     buf += 1;
     yasm_value_delete(&val);

yasm-1.1.0.tar.gz/modules/objfmts/dbg/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/dbg/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/dbg/dbg-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/dbg/dbg-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf-machine.h -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf-machine.h Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf-x86-amd64.c -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf-x86-amd64.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf-x86-x86.c -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf-x86-x86.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf.c -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/elf.h -> yasm-1.2.0.tar.gz/modules/objfmts/elf/elf.h Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/amd64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/amd64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/amd64/elf_amd64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/amd64/elf_amd64_test.sh Changed

yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/amd64/multiplefixup.asm Added

yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/amd64/multiplefixup.hex Added

@@ -0,0 +1,992 @@
+7f 
+45 
+4c 
+46 
+02 
+01 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+3e 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+20 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+07 
+00 
+01 
+00 
+48 
+8b 
+05 
+00 
+00 
+00 
+00 
+48 
+8b 
+05 
+00 
+00 
+00 
+00 
+48 
+8b 
+05 
+00 
+00 
+00 
+00 
+48 
+8b 
+05 
+00 
+00 
+00 
+00 
+48 
+8b 
+04 
+25 
+00 
+00 
+00 
+00 
+48 
+8b 
+04 
+25 
+00 
+00 
+00 
+00 
+48 
+8b 
+04 
+25 
+00 
+00 
+00 
+00 
+48 
+8b 
+04 
+25 
+00 
+00 
+00 
+00 
+eb 
+c2 
+eb 
+c0 
+eb 
+be 
+eb 
+bc 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+fc 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+0a 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+fc 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+ff 
+11 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+fc 
+ff 
+ff

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/elf-x86id.asm -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/elf-x86id.asm Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/elf_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/elf_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/gas32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/gas32/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/gas32/elf_gas32_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/gas32/elf_gas32_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/gas64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/gas64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/elf/tests/gas64/elf_gas64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/elf/tests/gas64/elf_gas64_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/macho-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/macho/macho-objfmt.c Changed

@@ -91,7 +91,6 @@
 */
 
 #include <util.h>
-/*@unused@*/ RCSID("$Id: macho-objfmt.c 2345 2010-08-01 01:27:40Z peter $");
 
 #include <libyasm.h>
 
@@ -922,7 +921,26 @@
             }
             /*printf("common symbol %s val %lu\n", name, yasm_intnum_get_uint(val));*/
         } else if (vis & YASM_SYM_GLOBAL) {
-            n_type |= N_EXT;
+            yasm_valparamhead *valparams =
+                yasm_symrec_get_objext_valparams(sym);
+
+            struct macho_global_data {
+                unsigned long flag; /* N_PEXT */
+            } data;
+
+            data.flag = 0;
+
+            if (valparams) {
+                static const yasm_dir_help help[] = {
+                    { "private_extern", 0, yasm_dir_helper_flag_set,
+                      offsetof(struct macho_global_data, flag), N_PEXT },
+                };
+                yasm_dir_helper(sym, yasm_vps_first(valparams),
+                                yasm_symrec_get_decl_line(sym), help, NELEMS(help),
+                                &data, yasm_dir_helper_valparam_warn);
+            }
+
+            n_type |= N_EXT | data.flag;
         }
 
         localbuf = info->buf;

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/gas32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/gas32/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/gas32/gas_macho32_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/gas32/gas_macho32_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/gas64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/gas64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/gas64/gas_macho64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/gas64/gas_macho64_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/nasm32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm32/Makefile.inc Changed

yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm32/macho32-pext.asm Added

yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm32/macho32-pext.hex Added

@@ -0,0 +1,202 @@
+ce 
+fa 
+ed 
+fe 
+07 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+94 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+7c 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+b0 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+5f 
+5f 
+74 
+65 
+78 
+74 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+5f 
+5f 
+54 
+45 
+58 
+54 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+b0 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+80 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+18 
+00 
+00 
+00 
+b4 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+c0 
+00 
+00 
+00 
+0a 
+00 
+00 
+00 
+c3 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+1f 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+66 
+75 
+6e 
+63 
+74 
+69

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/nasm32/macho32_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm32/macho32_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/nasm64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/macho/tests/nasm64/macho64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/macho/tests/nasm64/macho64_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/rdf/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/rdf/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/rdf/rdf-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/rdf/rdf-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/rdf/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/rdf/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/rdf/tests/rdf_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/rdf/tests/rdf_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/win32/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win32/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win32/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win32/tests/gas/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win32/tests/gas/win32_gas_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32_gas_test.sh Changed

yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32def.asm Added

yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32def.hex Added

yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32secrel32.asm Added

@@ -0,0 +1,80 @@
+# [oformat win32]
+.text
+
+	.ascii ">>>>"
+pre04:	.ascii "<<<<"
+	.ascii ">>>>>"
+pre0d:	.ascii "<<<"
+	.ascii ">>>>>>"
+pre16:	.ascii "<<"
+	.ascii ">>>>>>>"
+pre1f:	.ascii "<"
+
+.data
+
+	.ascii ">>>>"
+sam04:	.ascii "<<<<"
+	.ascii ">>>>>"
+sam0d:	.ascii "<<<"
+	.ascii ">>>>>>"
+sam16:	.ascii "<<"
+	.ascii ">>>>>>>"
+sam1f:	.ascii "<"
+
+	.ascii ">>>>"
+	.secrel32 pre04
+	.byte 0x11
+	.secrel32 pre0d
+	.byte 0x11
+	.secrel32 pre16
+	.byte 0x11
+	.secrel32 pre1f
+	.byte 0x11
+	.ascii "<<<<<<<<"
+
+	.ascii ">>>>"
+	.secrel32 sam04
+	.byte 0x11
+	.secrel32 sam0d
+	.byte 0x11
+	.secrel32 sam16
+	.byte 0x11
+	.secrel32 sam1f
+	.byte 0x11
+	.ascii "<<<<<<<<"
+
+	.ascii ">>>>"
+	.secrel32 nex04
+	.byte 0x11
+	.secrel32 nex0d
+	.byte 0x11
+	.secrel32 nex16
+	.byte 0x11
+	.secrel32 nex1f
+	.byte 0x11
+	.ascii "<<<<<<<<"
+
+	.ascii ">>>>"
+	.secrel32 ext24
+	.byte 0x11
+	.secrel32 ext2d
+	.byte 0x11
+	.secrel32 ext36
+	.byte 0x11
+	.secrel32 ext3f
+	.byte 0x11
+	.ascii "<<<<<<<<"
+
+.section .rdata
+
+	.ascii ">>>>"
+nex04:	.ascii "<<<<"
+	.ascii ">>>>>"
+nex0d:	.ascii "<<<"
+	.ascii ">>>>>>"
+nex16:	.ascii "<<"
+	.ascii ">>>>>>>"
+nex1f:	.ascii "<"
+	.ascii ">>>>"
+
+	.p2align 4,0

yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/gas/win32secrel32.hex Added

@@ -0,0 +1,778 @@
+4c 
+01 
+03 
+00 
+00 
+00 
+00 
+00 
+1c 
+02 
+00 
+00 
+0d 
+00 
+00 
+00 
+00 
+00 
+0c 
+01 
+2e 
+74 
+65 
+78 
+74 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+20 
+00 
+00 
+00 
+8c 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+20 
+00 
+50 
+60 
+2e 
+64 
+61 
+74 
+61 
+00 
+00 
+00 
+20 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+a0 
+00 
+00 
+00 
+ac 
+00 
+00 
+00 
+4c 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+40 
+00 
+30 
+c0 
+2e 
+72 
+64 
+61 
+74 
+61 
+00 
+00 
+c0 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+30 
+00 
+00 
+00 
+ec 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+50 
+40 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3c 
+3e 
+3e 
+3e 
+3e 
+3e 
+3e 
+3c 
+3c 
+3e 
+3e 
+3e

yasm-1.1.0.tar.gz/modules/objfmts/win32/tests/win32_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/win32/tests/win32_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/win64/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win64/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win64/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win64/tests/gas/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/gas/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/win64/tests/gas/win64_gas_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/gas/win64_gas_test.sh Changed

yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/win64-imagebase.asm Added

yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/win64-imagebase.hex Added

@@ -0,0 +1,512 @@
+64 
+86 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+0e 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+2e 
+74 
+65 
+78 
+74 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+b4 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+20 
+00 
+50 
+60 
+2e 
+70 
+64 
+61 
+74 
+61 
+00 
+00 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0c 
+00 
+00 
+00 
+b6 
+00 
+00 
+00 
+c2 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+40 
+00 
+30 
+40 
+2e 
+78 
+64 
+61 
+74 
+61 
+00 
+00 
+0e 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+08 
+00 
+00 
+00 
+e0 
+00 
+00 
+00 
+e8 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+40 
+00 
+40 
+40 
+2e 
+66 
+6f 
+6f 
+00 
+00 
+00 
+00 
+16 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+f2 
+00 
+00 
+00 
+f6 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+20 
+00 
+00 
+60 
+c3 
+c3 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+05

yasm-1.1.0.tar.gz/modules/objfmts/win64/tests/win64_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/win64/tests/win64_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/xdf/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/xdf/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/xdf/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/objfmts/xdf/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/objfmts/xdf/tests/xdf_test.sh -> yasm-1.2.0.tar.gz/modules/objfmts/xdf/tests/xdf_test.sh Changed

yasm-1.1.0.tar.gz/modules/objfmts/xdf/xdf-objfmt.c -> yasm-1.2.0.tar.gz/modules/objfmts/xdf/xdf-objfmt.c Changed

yasm-1.1.0.tar.gz/modules/objfmts/yasm_objfmts.xml -> yasm-1.2.0.tar.gz/modules/objfmts/yasm_objfmts.xml Changed

yasm-1.1.0.tar.gz/modules/parsers/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/gas/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-parse-intel.c -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-parse-intel.c Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-parse.c -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-parse.c Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-parser.c -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-parser.c Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-parser.h -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-parser.h Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/gas-token.re -> yasm-1.2.0.tar.gz/modules/parsers/gas/gas-token.re Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/bin/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/bin/gas-set.asm -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas-set.asm Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/bin/gas-set.hex -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas-set.hex Changed

yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas-str.asm Added

yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas-str.hex Added

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/bin/gas_bin_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/bin/gas_bin_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/gas/tests/gas_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/gas/tests/gas_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/nasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-parse.c -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-parse.c Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-parser-struct.h -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-parser-struct.h Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-parser.c -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-parser.c Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-parser.h -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-parser.h Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-std.mac -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-std.mac Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/nasm-token.re -> yasm-1.2.0.tar.gz/modules/parsers/nasm/nasm-token.re Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/tests/nasm_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/nasm_test.sh Changed

yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/strucbase.asm Added

yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/strucbase.hex Added

yasm-1.1.0.tar.gz/modules/parsers/nasm/tests/worphan/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/worphan/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/nasm/tests/worphan/nasm_worphan_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/tasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/tasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/tests/exe/Makefile.inc -> yasm-1.2.0.tar.gz/modules/parsers/tasm/tests/exe/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/tests/exe/tasm_exe_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/tasm/tests/exe/tasm_exe_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/tasm/tests/tasm_test.sh -> yasm-1.2.0.tar.gz/modules/parsers/tasm/tests/tasm_test.sh Changed

yasm-1.1.0.tar.gz/modules/parsers/yasm_parsers.xml -> yasm-1.2.0.tar.gz/modules/parsers/yasm_parsers.xml Changed

yasm-1.1.0.tar.gz/modules/preprocs/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/gas/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/gas/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/gas/gas-eval.c -> yasm-1.2.0.tar.gz/modules/preprocs/gas/gas-eval.c Changed

yasm-1.1.0.tar.gz/modules/preprocs/gas/gas-preproc.c -> yasm-1.2.0.tar.gz/modules/preprocs/gas/gas-preproc.c Changed

@@ -26,7 +26,6 @@
  */
 #include <util.h>
 #include <ctype.h>
-/*@unused@*/ RCSID("$Id: gas-preproc.c 2348 2010-08-01 17:44:56Z peter $");
 
 #include <libyasm.h>
 #include "modules/preprocs/gas/gas-eval.h"
@@ -60,6 +59,18 @@
     STAILQ_ENTRY(macro_entry) next;
 } macro_entry;
 
+typedef struct deferred_define {
+    char *name;
+    char *value;
+    SLIST_ENTRY(deferred_define) next;
+} deferred_define;
+
+typedef struct expr_state {
+    const char *string;
+    char *symbol;
+    int string_cursor;
+} expr_state;
+
 typedef struct yasm_preproc_gas {
     yasm_preproc_base preproc;   /* base structure */
 
@@ -67,15 +78,14 @@
     char *in_filename;
 
     yasm_symtab *defines;
+    SLIST_HEAD(deferred_defines_head, deferred_define) deferred_defines;
 
     int depth;
     int skip_depth;
 
     int in_comment;
 
-    const char *expr_string;
-    char *expr_symbol;
-    int expr_string_cursor;
+    expr_state expr;
 
     SLIST_HEAD(buffered_lines_head, buffered_line) buffered_lines;
     SLIST_HEAD(included_files_head, included_file) included_files;
@@ -88,10 +98,15 @@
     yasm_linemap *cur_lm;
     yasm_errwarns *errwarns;
     int fatal_error;
+    int detect_errors_only;
 } yasm_preproc_gas;
 
 yasm_preproc_module yasm_gas_LTX_preproc;
 
+/* Forward declarations. */
+
+static int substitute_values(yasm_preproc_gas *pp, char **line_ptr);
+
 /* String helpers. */
 
 static const char *starts_with(const char *big, const char *little)
@@ -278,17 +293,44 @@
 
 static char get_char(yasm_preproc_gas *pp)
 {
-    return pp->expr_string[pp->expr_string_cursor];
+    return pp->expr.string[pp->expr.string_cursor];
 }
 
 static const char *get_str(yasm_preproc_gas *pp)
 {
-    return pp->expr_string + pp->expr_string_cursor;
+    return pp->expr.string + pp->expr.string_cursor;
 }
 
 static void next_char(yasm_preproc_gas *pp)
 {
-    pp->expr_string_cursor++;
+    pp->expr.string_cursor++;
+}
+
+static int ishex(char c)
+{
+    c = tolower(c);
+    return isdigit(c) || (c >= 'a' && c <= 'f');
+}
+
+static void gas_scan_init(yasm_preproc_gas *pp, struct tokenval *tokval, const char *arg1)
+{
+    pp->expr.symbol = NULL;
+    pp->expr.string = arg1;
+    pp->expr.string_cursor = 0;
+    memset(tokval, 0, sizeof(struct tokenval));
+    tokval->t_type = TOKEN_INVALID;
+}
+
+static void gas_scan_cleanup(yasm_preproc_gas *pp, struct tokenval *tokval)
+{
+    if (tokval->t_integer) {
+        yasm_intnum_destroy(tokval->t_integer);
+        tokval->t_integer = NULL;
+    }
+    if (pp->expr.symbol) {
+        yasm_xfree(pp->expr.symbol);
+        pp->expr.symbol = NULL;
+    }
 }
 
 static int gas_scan(void *preproc, struct tokenval *tokval)
@@ -311,12 +353,34 @@
     }
 
     if (isdigit(c)) {
+        int char_index = 0;
         int value = 0;
+
         do {
             value = value*10 + (c - '0');
+            char_index++;
             next_char(pp);
             c = get_char(pp);
+            if (char_index == 1 && c == 'x' && value == 0) {
+                next_char(pp);
+                c = get_char(pp);
+                /* Hex notation. */
+                while (ishex(c)) {
+                    if (isdigit(c)) {
+                        value = (value << 4) | (c - '0');
+                    } else {
+                        value = (value << 4) | (tolower(c) - 'a' + 0xa);
+                    }
+                    next_char(pp);
+                    c = get_char(pp);
+                }
+                break;
+            }
         } while (isdigit(c));
+
+        if (tokval->t_integer) {
+            yasm_intnum_destroy(tokval->t_integer);
+        }
         tokval->t_integer = yasm_intnum_create_int(value);
         return tokval->t_type = TOKEN_NUM;
     }
@@ -373,12 +437,12 @@
                 c = get_char(pp);
             }
 
-            pp->expr_symbol = yasm_xrealloc(pp->expr_symbol, symbol_length + 1);
-            memcpy(pp->expr_symbol, str, symbol_length);
-            pp->expr_symbol[symbol_length] = '\0';
+            pp->expr.symbol = yasm_xrealloc(pp->expr.symbol, symbol_length + 1);
+            memcpy(pp->expr.symbol, str, symbol_length);
+            pp->expr.symbol[symbol_length] = '\0';
 
             tokval->t_type = TOKEN_ID;
-            tokval->t_charptr = pp->expr_symbol;
+            tokval->t_charptr = pp->expr.symbol;
         }
     }
     
@@ -390,10 +454,12 @@
     va_list args;
     yasm_preproc_gas *pp = private_data;
 
-    va_start(args, fmt);
-    yasm_error_set_va(YASM_ERROR_SYNTAX, N_(fmt), args);
-    yasm_errwarn_propagate(pp->errwarns, pp->current_line_number);
-    va_end(args);
+    if (!pp->detect_errors_only) {
+        va_start(args, fmt);
+        yasm_error_set_va(YASM_ERROR_SYNTAX, N_(fmt), args);
+        yasm_errwarn_propagate(pp->errwarns, pp->current_line_number);
+        va_end(args);
+    }
 
     pp->fatal_error = 1;
 }
@@ -404,25 +470,20 @@
     yasm_expr *expr;
     yasm_intnum *intn;
     long value;
+    expr_state prev_state;
 
     if (!*arg1) {
         return 0;
     }
 
-    tv.t_type = TOKEN_INVALID;
-
-    pp->expr_symbol = NULL;
-    pp->expr_string = arg1;
-    pp->expr_string_cursor = 0;
+    prev_state = pp->expr;
+    gas_scan_init(pp, &tv, arg1);
     expr = evaluate(gas_scan, pp, &tv, pp, CRITICAL, gas_err, pp->defines);
     intn = yasm_expr_get_intnum(&expr, 0);
     value = yasm_intnum_get_int(intn);
     yasm_expr_destroy(expr);
-

yasm-1.1.0.tar.gz/modules/preprocs/gas/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/gas/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/genversion.c -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/genversion.c Changed

@@ -1,4 +1,4 @@
-/* $Id: genversion.c 2082 2008-05-09 06:46:02Z peter $
+/*
  *
  * Generate version.mac
  *
@@ -36,14 +36,19 @@
 main(int argc, char *argv[])
 {
     FILE *out;
-    int major, minor, subminor;
+    int major, minor, subminor, patchlevel, matched;
 
     if (argc != 2) {
         fprintf(stderr, "Usage: %s <outfile>\n", argv[0]);
         return EXIT_FAILURE;
     }
 
-    if (sscanf(PACKAGE_INTVER, "%d.%d.%d", &major, &minor, &subminor) != 3) {
+    matched = sscanf(PACKAGE_VERSION, "%d.%d.%d.%d", &major, &minor, &subminor,
+                     &patchlevel);
+
+    if (matched == 3)
+        patchlevel = 0;
+    else if (matched != 4) {
         fprintf(stderr, "Version tokenizing error\n");
         return EXIT_FAILURE;
     }
@@ -61,17 +66,15 @@
     fprintf(out, "%%define __YASM_MAJOR__ %d\n", major);
     fprintf(out, "%%define __YASM_MINOR__ %d\n", minor);
     fprintf(out, "%%define __YASM_SUBMINOR__ %d\n", subminor);
-    if (!isdigit(PACKAGE_BUILD[0]))
-        fprintf(out, "%%define __YASM_BUILD__ 0\n");
-    else
-        fprintf(out, "%%define __YASM_BUILD__ %d\n", atoi(PACKAGE_BUILD));
+    fprintf(out, "%%define __YASM_BUILD__ %d\n", patchlevel);
+    fprintf(out, "%%define __YASM_PATCHLEVEL__ %d\n", patchlevel);
 
     /* Version id (hex number) */
-    fprintf(out, "%%define __YASM_VERSION_ID__ 0%02x%02x%02x00h\n", major,
-            minor, subminor);
+    fprintf(out, "%%define __YASM_VERSION_ID__ 0%02x%02x%02x%02xh\n", major,
+            minor, subminor, patchlevel);
 
-    /* Version string - version sans build */
-    fprintf(out, "%%define __YASM_VER__ \"%s\"\n", PACKAGE_INTVER);
+    /* Version string */
+    fprintf(out, "%%define __YASM_VER__ \"%s\"\n", PACKAGE_VERSION);
     fclose(out);
 
     return EXIT_SUCCESS;

yasm-1.1.0.tar.gz/modules/preprocs/nasm/nasm-pp.c -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/nasm-pp.c Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/nasm-preproc.c -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/nasm-preproc.c Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/nasm/tests/nasmpp_test.sh -> yasm-1.2.0.tar.gz/modules/preprocs/nasm/tests/nasmpp_test.sh Changed

yasm-1.1.0.tar.gz/modules/preprocs/raw/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/raw/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/raw/raw-preproc.c -> yasm-1.2.0.tar.gz/modules/preprocs/raw/raw-preproc.c Changed

yasm-1.1.0.tar.gz/modules/preprocs/raw/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/raw/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/raw/tests/rawpp_test.sh -> yasm-1.2.0.tar.gz/modules/preprocs/raw/tests/rawpp_test.sh Changed

yasm-1.1.0.tar.gz/modules/preprocs/tasm/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/tasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/tasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/modules/preprocs/tasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/modules/preprocs/tasm/tests/tasmpp_test.sh -> yasm-1.2.0.tar.gz/modules/preprocs/tasm/tests/tasmpp_test.sh Changed

yasm-1.1.0.tar.gz/out_test.sh -> yasm-1.2.0.tar.gz/out_test.sh Changed

yasm-1.1.0.tar.gz/po/POTFILES.in -> yasm-1.2.0.tar.gz/po/POTFILES.in Changed

yasm-1.2.0.tar.gz/po/stamp-po Added

yasm-1.2.0.tar.gz/po/yasm.pot Added

@@ -0,0 +1,2420 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Peter Johnson and other YASM developers
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: yasm 1.2.0\n"
+"Report-Msgid-Bugs-To: bug-yasm@tortall.net\n"
+"POT-Creation-Date: 2011-10-31 00:12-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: frontends/yasm/yasm-options.c:86
+#, c-format
+msgid "option `--%s' needs an argument!"
+msgstr ""
+
+#: frontends/yasm/yasm-options.c:106 frontends/yasm/yasm-options.c:144
+#, c-format
+msgid "warning: unrecognized option `%s'"
+msgstr ""
+
+#: frontends/yasm/yasm-options.c:125
+#, c-format
+msgid "option `-%c' needs an argument!"
+msgstr ""
+
+#: frontends/yasm/yasm-options.c:179 frontends/yasm/yasm-options.c:187
+msgid "param"
+msgstr ""
+
+#: frontends/yasm/yasm.c:146
+msgid "show version text"
+msgstr ""
+
+#: frontends/yasm/yasm.c:148
+msgid "show license text"
+msgstr ""
+
+#: frontends/yasm/yasm.c:150
+msgid "show help text"
+msgstr ""
+
+#: frontends/yasm/yasm.c:152
+msgid "select architecture (list with -a help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:152
+msgid "arch"
+msgstr ""
+
+#: frontends/yasm/yasm.c:154
+msgid "select parser (list with -p help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:154 frontends/yasm/yasm.c:406
+#: frontends/yasm/yasm.c:447 frontends/yasm/yasm.c:675
+#: frontends/yasm/yasm.c:877
+msgid "parser"
+msgstr ""
+
+#: frontends/yasm/yasm.c:156
+msgid "select preprocessor (list with -r help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:156
+msgid "preproc"
+msgstr ""
+
+#: frontends/yasm/yasm.c:158
+msgid "select object format (list with -f help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:158
+msgid "format"
+msgstr ""
+
+#: frontends/yasm/yasm.c:160
+msgid "select debugging format (list with -g help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:160
+msgid "debug"
+msgstr ""
+
+#: frontends/yasm/yasm.c:162
+msgid "select list format (list with -L help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:162
+msgid "list"
+msgstr ""
+
+#: frontends/yasm/yasm.c:164
+msgid "name of list-file output"
+msgstr ""
+
+#: frontends/yasm/yasm.c:164
+msgid "listfile"
+msgstr ""
+
+#: frontends/yasm/yasm.c:166
+msgid "name of object-file output"
+msgstr ""
+
+#: frontends/yasm/yasm.c:166 frontends/yasm/yasm.c:168
+#: frontends/yasm/yasm.c:190
+msgid "filename"
+msgstr ""
+
+#: frontends/yasm/yasm.c:168
+msgid "name of map-file output"
+msgstr ""
+
+#: frontends/yasm/yasm.c:170
+msgid "select machine (list with -m help)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:170 frontends/yasm/yasm.c:400
+msgid "machine"
+msgstr ""
+
+#: frontends/yasm/yasm.c:172
+msgid "treat all sized operands as if `strict' was used"
+msgstr ""
+
+#: frontends/yasm/yasm.c:174
+msgid "inhibits warning messages"
+msgstr ""
+
+#: frontends/yasm/yasm.c:176
+msgid "enables/disables warning"
+msgstr ""
+
+#: frontends/yasm/yasm.c:178
+msgid "generate Makefile dependencies on stdout"
+msgstr ""
+
+#: frontends/yasm/yasm.c:180
+msgid "redirect error messages to file"
+msgstr ""
+
+#: frontends/yasm/yasm.c:180
+msgid "file"
+msgstr ""
+
+#: frontends/yasm/yasm.c:182
+msgid "redirect error messages to stdout"
+msgstr ""
+
+#: frontends/yasm/yasm.c:184
+msgid "preprocess only (writes output to stdout by default)"
+msgstr ""
+
+#: frontends/yasm/yasm.c:186 frontends/yasm/yasm.c:188
+msgid "add include path"
+msgstr ""
+
+#: frontends/yasm/yasm.c:186 frontends/yasm/yasm.c:188
+msgid "path"
+msgstr ""
+
+#: frontends/yasm/yasm.c:190
+msgid "pre-include file"
+msgstr ""
+
+#: frontends/yasm/yasm.c:192 frontends/yasm/yasm.c:194
+msgid "pre-define a macro, optionally to value"
+msgstr ""
+
+#: frontends/yasm/yasm.c:192 frontends/yasm/yasm.c:194
+msgid "macro[=value]"
+msgstr ""
+
+#: frontends/yasm/yasm.c:196 frontends/yasm/yasm.c:198
+msgid "undefine a macro"
+msgstr ""
+
+#: frontends/yasm/yasm.c:196 frontends/yasm/yasm.c:198
+msgid "macro"
+msgstr ""
+
+#: frontends/yasm/yasm.c:200
+msgid "select error/warning message style (`gnu' or `vc')"
+msgstr ""
+
+#: frontends/yasm/yasm.c:200
+msgid "style"
+msgstr ""
+
+#: frontends/yasm/yasm.c:202
+msgid "prepend argument to name of all external symbols"

yasm-1.1.0.tar.gz/test_hd.c -> yasm-1.2.0.tar.gz/test_hd.c Changed

yasm-1.1.0.tar.gz/tools/Makefile.inc -> yasm-1.2.0.tar.gz/tools/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/genmacro/Makefile.inc -> yasm-1.2.0.tar.gz/tools/genmacro/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/genmacro/genmacro.c -> yasm-1.2.0.tar.gz/tools/genmacro/genmacro.c Changed

yasm-1.1.0.tar.gz/tools/genperf/Makefile.inc -> yasm-1.2.0.tar.gz/tools/genperf/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/genperf/genperf.c -> yasm-1.2.0.tar.gz/tools/genperf/genperf.c Changed

yasm-1.1.0.tar.gz/tools/genperf/perfect.c -> yasm-1.2.0.tar.gz/tools/genperf/perfect.c Changed

yasm-1.1.0.tar.gz/tools/python-yasm/Makefile.inc -> yasm-1.2.0.tar.gz/tools/python-yasm/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/Makefile.inc -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/__init__.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/__init__.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/python_test.sh -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/python_test.sh Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/test_bytecode.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/test_bytecode.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/test_expr.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/test_expr.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/test_intnum.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/test_intnum.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/tests/test_symrec.py -> yasm-1.2.0.tar.gz/tools/python-yasm/tests/test_symrec.py Changed

yasm-1.1.0.tar.gz/tools/python-yasm/yasm.pyx -> yasm-1.2.0.tar.gz/tools/python-yasm/yasm.pyx Changed

yasm-1.1.0.tar.gz/tools/re2c/Makefile.inc -> yasm-1.2.0.tar.gz/tools/re2c/Makefile.inc Changed

yasm-1.1.0.tar.gz/tools/re2c/code.c -> yasm-1.2.0.tar.gz/tools/re2c/code.c Changed

@@ -1,3 +1,7 @@
+#ifdef _WIN32
+#include <windows.h>
+#include <io.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -6,6 +10,57 @@
 #include "tools/re2c/dfa.h"
 #include "tools/re2c/parse.h"
 
+#ifdef _WIN32
+/* tmpfile() replacment for Windows.
+ *
+ * On Windows tmpfile() creates the file in the root directory. This
+ * may fail due to unsufficient privileges.
+ */
+static FILE *
+win32_tmpfile (void)
+{
+    DWORD path_len;
+    WCHAR path_name[MAX_PATH + 1];
+    WCHAR file_name[MAX_PATH + 1];
+    HANDLE handle;
+    int fd;
+    FILE *fp;
+
+    path_len = GetTempPathW (MAX_PATH, path_name);
+    if (path_len <= 0 || path_len >= MAX_PATH)
+	return NULL;
+
+    if (GetTempFileNameW (path_name, L"ps_", 0, file_name) == 0)
+	return NULL;
+
+    handle = CreateFileW (file_name,
+			 GENERIC_READ | GENERIC_WRITE,
+			 0,
+			 NULL,
+			 CREATE_ALWAYS,
+			 FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE,
+			 NULL);
+    if (handle == INVALID_HANDLE_VALUE) {
+	DeleteFileW (file_name);
+	return NULL;
+    }
+
+    fd = _open_osfhandle((intptr_t) handle, 0);
+    if (fd < 0) {
+	CloseHandle (handle);
+	return NULL;
+    }
+
+    fp = fdopen(fd, "w+b");
+    if (fp == NULL) {
+	_close(fd);
+	return NULL;
+    }
+
+    return fp;
+}
+#endif
+
 static void useLabel(size_t value) {
     while (value >= vUsedLabelAlloc) {
 	vUsedLabels = realloc(vUsedLabels, vUsedLabelAlloc * 2);
@@ -844,14 +899,17 @@
     nOrgOline = oline;
     maxFillIndexes = vFillIndexes;
     orgVFillIndexes = vFillIndexes;
-    tmpo = fopen("re2c.tmp", "wt");
+#ifdef _WIN32
+    tmpo = win32_tmpfile();
+#else
+    tmpo = tmpfile();
+#endif
     for(s = d->head; s; s = s->next){
 	int readCh = 0;
 	State_emit(s, tmpo, &readCh);
 	Go_genGoto(&s->go, tmpo, s, s->next, &readCh);
     }
     fclose(tmpo);
-    remove("re2c.tmp");
     maxFillIndexes = vFillIndexes;
     vFillIndexes = orgVFillIndexes;
     oline = nOrgOline;

yasm-1.1.0.tar.gz/util.h -> yasm-1.2.0.tar.gz/util.h Changed

yasm-1.2.0.tar.gz/version Added

yasm-1.1.0.tar.gz/x86insn_gas.gperf -> yasm-1.2.0.tar.gz/x86insn_gas.gperf Changed

@@ -1,4 +1,4 @@
-/* Generated by gen_x86_insn.py r2346, do not edit */
+/* Generated by gen_x86_insn.py rHEAD, do not edit */
 %ignore-case
 %language=ANSI-C
 %compare-strncmp
@@ -21,10 +21,9 @@
 add,	arith_insn,	22,	SUF_Z,	0x00,	0x00,	0,	0,	0,	0,	0
 addb,	arith_insn,	22,	SUF_B,	0x00,	0x00,	0,	0,	0,	0,	0
 addl,	arith_insn,	22,	SUF_L,	0x00,	0x00,	0,	0,	CPU_386,	0,	0
-addq,	arith_insn,	22,	SUF_Q,	0x00,	0x00,	0,	ONLY_64,	0,	0,	0
-addw,	arith_insn,	22,	SUF_W,	0x00,	0x00,	0,	0,	0,	0,	0
 addpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x58,	0,	0,	CPU_SSE2,	0,	0
 addps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x58,	0,	0,	CPU_SSE,	0,	0
+addq,	arith_insn,	22,	SUF_Q,	0x00,	0x00,	0,	ONLY_64,	0,	0,	0
 addr16,	NULL,	X86_ADDRSIZE>>8,	0x10,	0,	0,	0,	0,	0,	0,	0
 addr32,	NULL,	X86_ADDRSIZE>>8,	0x20,	0,	0,	0,	0,	0,	0,	0
 addr64,	NULL,	X86_ADDRSIZE>>8,	0x40,	0,	0,	0,	ONLY_64,	0,	0,	0
@@ -32,6 +31,7 @@
 addss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x58,	0,	0,	CPU_SSE,	0,	0
 addsubpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0xD0,	0,	0,	CPU_SSE3,	0,	0
 addsubps,	xmm_xmm128_insn,	2,	SUF_Z,	0xF2,	0xD0,	0,	0,	CPU_SSE3,	0,	0
+addw,	arith_insn,	22,	SUF_W,	0x00,	0x00,	0,	0,	0,	0,	0
 adword,	NULL,	X86_ADDRSIZE>>8,	0x20,	0,	0,	0,	0,	0,	0,	0
 aesdec,	aes_insn,	2,	SUF_Z,	0x38,	0xDE,	0,	0,	CPU_AVX,	0,	0
 aesdeclast,	aes_insn,	2,	SUF_Z,	0x38,	0xDF,	0,	0,	CPU_AVX,	0,	0
@@ -42,20 +42,35 @@
 and,	arith_insn,	22,	SUF_Z,	0x20,	0x04,	0,	0,	0,	0,	0
 andb,	arith_insn,	22,	SUF_B,	0x20,	0x04,	0,	0,	0,	0,	0
 andl,	arith_insn,	22,	SUF_L,	0x20,	0x04,	0,	0,	CPU_386,	0,	0
-andq,	arith_insn,	22,	SUF_Q,	0x20,	0x04,	0,	ONLY_64,	0,	0,	0
-andw,	arith_insn,	22,	SUF_W,	0x20,	0x04,	0,	0,	0,	0,	0
+andn,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF2,	ONLY_AVX,	CPU_BMI1,	0,	0
+andnl,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_L,	0x00,	0x38,	0xF2,	ONLY_AVX,	CPU_BMI1,	0,	0
 andnpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x55,	0,	0,	CPU_SSE2,	0,	0
 andnps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x55,	0,	0,	CPU_SSE,	0,	0
+andnq,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Q,	0x00,	0x38,	0xF2,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
 andpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x54,	0,	0,	CPU_SSE2,	0,	0
 andps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x54,	0,	0,	CPU_SSE,	0,	0
+andq,	arith_insn,	22,	SUF_Q,	0x20,	0x04,	0,	ONLY_64,	0,	0,	0
+andw,	arith_insn,	22,	SUF_W,	0x20,	0x04,	0,	0,	0,	0,	0
 aqword,	NULL,	X86_ADDRSIZE>>8,	0x40,	0,	0,	0,	ONLY_64,	0,	0,	0
 arpl,	arpl_insn,	1,	SUF_Z,	0,	0,	0,	NOT_64,	CPU_286,	CPU_Prot,	0
 arplw,	arpl_insn,	1,	SUF_W,	0,	0,	0,	NOT_64,	CPU_286,	CPU_Prot,	0
 aword,	NULL,	X86_ADDRSIZE>>8,	0x10,	0,	0,	0,	0,	0,	0,	0
+bextr,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI1,	0,	0
+bextrl,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_L,	0x00,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI1,	0,	0
+bextrq,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Q,	0x00,	0x38,	0xF7,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
 blendpd,	sse4imm_insn,	2,	SUF_Z,	0x0D,	0,	0,	0,	CPU_SSE41,	0,	0
 blendps,	sse4imm_insn,	2,	SUF_Z,	0x0C,	0,	0,	0,	CPU_SSE41,	0,	0
 blendvpd,	sse4xmm0_insn,	2,	SUF_Z,	0x15,	0,	0,	0,	CPU_SSE41,	0,	0
 blendvps,	sse4xmm0_insn,	2,	SUF_Z,	0x14,	0,	0,	0,	CPU_SSE41,	0,	0
+blsi,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x03,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsil,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_L,	0x00,	0xF3,	0x03,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
+blsiw,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_W,	0x00,	0xF3,	0x03,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsmsk,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x02,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsmskl,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_L,	0x00,	0xF3,	0x02,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
+blsmskw,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_W,	0x00,	0xF3,	0x02,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsr,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x01,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsrl,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_L,	0x00,	0xF3,	0x01,	ONLY_64|ONLY_AVX,	CPU_BMI1,	0,	0
+blsrw,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_W,	0x00,	0xF3,	0x01,	ONLY_AVX,	CPU_BMI1,	0,	0
 bound,	bound_insn,	2,	SUF_Z,	0,	0,	0,	NOT_64,	CPU_186,	0,	0
 boundl,	bound_insn,	2,	SUF_L,	0,	0,	0,	NOT_64,	CPU_386,	0,	0
 boundw,	bound_insn,	2,	SUF_W,	0,	0,	0,	NOT_64,	CPU_186,	0,	0
@@ -71,13 +86,12 @@
 bswapl,	bswap_insn,	2,	SUF_L,	0,	0,	0,	0,	CPU_486,	0,	0
 bswapq,	bswap_insn,	2,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
 bt,	bittest_insn,	6,	SUF_Z,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
-btl,	bittest_insn,	6,	SUF_L,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
-btq,	bittest_insn,	6,	SUF_Q,	0xA3,	0x04,	0,	ONLY_64,	CPU_386,	0,	0
-btw,	bittest_insn,	6,	SUF_W,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
 btc,	bittest_insn,	6,	SUF_Z,	0xBB,	0x07,	0,	0,	CPU_386,	0,	0
 btcl,	bittest_insn,	6,	SUF_L,	0xBB,	0x07,	0,	0,	CPU_386,	0,	0
 btcq,	bittest_insn,	6,	SUF_Q,	0xBB,	0x07,	0,	ONLY_64,	CPU_386,	0,	0
 btcw,	bittest_insn,	6,	SUF_W,	0xBB,	0x07,	0,	0,	CPU_386,	0,	0
+btl,	bittest_insn,	6,	SUF_L,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
+btq,	bittest_insn,	6,	SUF_Q,	0xA3,	0x04,	0,	ONLY_64,	CPU_386,	0,	0
 btr,	bittest_insn,	6,	SUF_Z,	0xB3,	0x06,	0,	0,	CPU_386,	0,	0
 btrl,	bittest_insn,	6,	SUF_L,	0xB3,	0x06,	0,	0,	CPU_386,	0,	0
 btrq,	bittest_insn,	6,	SUF_Q,	0xB3,	0x06,	0,	ONLY_64,	CPU_386,	0,	0
@@ -86,6 +100,10 @@
 btsl,	bittest_insn,	6,	SUF_L,	0xAB,	0x05,	0,	0,	CPU_386,	0,	0
 btsq,	bittest_insn,	6,	SUF_Q,	0xAB,	0x05,	0,	ONLY_64,	CPU_386,	0,	0
 btsw,	bittest_insn,	6,	SUF_W,	0xAB,	0x05,	0,	0,	CPU_386,	0,	0
+btw,	bittest_insn,	6,	SUF_W,	0xA3,	0x04,	0,	0,	CPU_386,	0,	0
+bzhi,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
+bzhil,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_L,	0x00,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
+bzhiq,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Q,	0x00,	0x38,	0xF5,	ONLY_64|ONLY_AVX,	CPU_BMI2,	0,	0
 call,	call_insn,	30,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 calll,	call_insn,	30,	SUF_L,	0,	0,	0,	0,	CPU_386,	0,	0
 callq,	call_insn,	30,	SUF_Q,	0,	0,	0,	ONLY_64,	0,	0,	0
@@ -104,21 +122,21 @@
 clts,	twobyte_insn,	1,	SUF_Z,	0x0F,	0x06,	0,	0,	CPU_286,	CPU_Priv,	0
 cmc,	onebyte_insn,	1,	SUF_Z,	0xF5,	0,	0,	0,	0,	0,	0
 cmova,	cmovcc_insn,	3,	SUF_Z,	0x07,	0,	0,	0,	CPU_686,	0,	0
-cmoval,	cmovcc_insn,	3,	SUF_L,	0x07,	0,	0,	0,	CPU_686,	0,	0
-cmovaq,	cmovcc_insn,	3,	SUF_Q,	0x07,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovaw,	cmovcc_insn,	3,	SUF_W,	0x07,	0,	0,	0,	CPU_686,	0,	0
 cmovae,	cmovcc_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovael,	cmovcc_insn,	3,	SUF_L,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovaeq,	cmovcc_insn,	3,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovaew,	cmovcc_insn,	3,	SUF_W,	0x03,	0,	0,	0,	CPU_686,	0,	0
+cmoval,	cmovcc_insn,	3,	SUF_L,	0x07,	0,	0,	0,	CPU_686,	0,	0
+cmovaq,	cmovcc_insn,	3,	SUF_Q,	0x07,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovaw,	cmovcc_insn,	3,	SUF_W,	0x07,	0,	0,	0,	CPU_686,	0,	0
 cmovb,	cmovcc_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_686,	0,	0
-cmovbl,	cmovcc_insn,	3,	SUF_L,	0x02,	0,	0,	0,	CPU_686,	0,	0
-cmovbq,	cmovcc_insn,	3,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovbw,	cmovcc_insn,	3,	SUF_W,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovbe,	cmovcc_insn,	3,	SUF_Z,	0x06,	0,	0,	0,	CPU_686,	0,	0
 cmovbel,	cmovcc_insn,	3,	SUF_L,	0x06,	0,	0,	0,	CPU_686,	0,	0
 cmovbeq,	cmovcc_insn,	3,	SUF_Q,	0x06,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovbew,	cmovcc_insn,	3,	SUF_W,	0x06,	0,	0,	0,	CPU_686,	0,	0
+cmovbl,	cmovcc_insn,	3,	SUF_L,	0x02,	0,	0,	0,	CPU_686,	0,	0
+cmovbq,	cmovcc_insn,	3,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovbw,	cmovcc_insn,	3,	SUF_W,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovc,	cmovcc_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovcl,	cmovcc_insn,	3,	SUF_L,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovcq,	cmovcc_insn,	3,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_686,	0,	0
@@ -128,37 +146,37 @@
 cmoveq,	cmovcc_insn,	3,	SUF_Q,	0x04,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovew,	cmovcc_insn,	3,	SUF_W,	0x04,	0,	0,	0,	CPU_686,	0,	0
 cmovg,	cmovcc_insn,	3,	SUF_Z,	0x0F,	0,	0,	0,	CPU_686,	0,	0
-cmovgl,	cmovcc_insn,	3,	SUF_L,	0x0F,	0,	0,	0,	CPU_686,	0,	0
-cmovgq,	cmovcc_insn,	3,	SUF_Q,	0x0F,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovgw,	cmovcc_insn,	3,	SUF_W,	0x0F,	0,	0,	0,	CPU_686,	0,	0
 cmovge,	cmovcc_insn,	3,	SUF_Z,	0x0D,	0,	0,	0,	CPU_686,	0,	0
 cmovgel,	cmovcc_insn,	3,	SUF_L,	0x0D,	0,	0,	0,	CPU_686,	0,	0
 cmovgeq,	cmovcc_insn,	3,	SUF_Q,	0x0D,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovgew,	cmovcc_insn,	3,	SUF_W,	0x0D,	0,	0,	0,	CPU_686,	0,	0
+cmovgl,	cmovcc_insn,	3,	SUF_L,	0x0F,	0,	0,	0,	CPU_686,	0,	0
+cmovgq,	cmovcc_insn,	3,	SUF_Q,	0x0F,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovgw,	cmovcc_insn,	3,	SUF_W,	0x0F,	0,	0,	0,	CPU_686,	0,	0
 cmovl,	cmovcc_insn,	3,	SUF_Z,	0x0C,	0,	0,	0,	CPU_686,	0,	0
-cmovll,	cmovcc_insn,	3,	SUF_L,	0x0C,	0,	0,	0,	CPU_686,	0,	0
-cmovlq,	cmovcc_insn,	3,	SUF_Q,	0x0C,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovlw,	cmovcc_insn,	3,	SUF_W,	0x0C,	0,	0,	0,	CPU_686,	0,	0
 cmovle,	cmovcc_insn,	3,	SUF_Z,	0x0E,	0,	0,	0,	CPU_686,	0,	0
 cmovlel,	cmovcc_insn,	3,	SUF_L,	0x0E,	0,	0,	0,	CPU_686,	0,	0
 cmovleq,	cmovcc_insn,	3,	SUF_Q,	0x0E,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovlew,	cmovcc_insn,	3,	SUF_W,	0x0E,	0,	0,	0,	CPU_686,	0,	0
+cmovll,	cmovcc_insn,	3,	SUF_L,	0x0C,	0,	0,	0,	CPU_686,	0,	0
+cmovlq,	cmovcc_insn,	3,	SUF_Q,	0x0C,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovlw,	cmovcc_insn,	3,	SUF_W,	0x0C,	0,	0,	0,	CPU_686,	0,	0
 cmovna,	cmovcc_insn,	3,	SUF_Z,	0x06,	0,	0,	0,	CPU_686,	0,	0
-cmovnal,	cmovcc_insn,	3,	SUF_L,	0x06,	0,	0,	0,	CPU_686,	0,	0
-cmovnaq,	cmovcc_insn,	3,	SUF_Q,	0x06,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovnaw,	cmovcc_insn,	3,	SUF_W,	0x06,	0,	0,	0,	CPU_686,	0,	0
 cmovnae,	cmovcc_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovnael,	cmovcc_insn,	3,	SUF_L,	0x02,	0,	0,	0,	CPU_686,	0,	0
 cmovnaeq,	cmovcc_insn,	3,	SUF_Q,	0x02,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovnaew,	cmovcc_insn,	3,	SUF_W,	0x02,	0,	0,	0,	CPU_686,	0,	0
+cmovnal,	cmovcc_insn,	3,	SUF_L,	0x06,	0,	0,	0,	CPU_686,	0,	0
+cmovnaq,	cmovcc_insn,	3,	SUF_Q,	0x06,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovnaw,	cmovcc_insn,	3,	SUF_W,	0x06,	0,	0,	0,	CPU_686,	0,	0
 cmovnb,	cmovcc_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_686,	0,	0
-cmovnbl,	cmovcc_insn,	3,	SUF_L,	0x03,	0,	0,	0,	CPU_686,	0,	0
-cmovnbq,	cmovcc_insn,	3,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovnbw,	cmovcc_insn,	3,	SUF_W,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovnbe,	cmovcc_insn,	3,	SUF_Z,	0x07,	0,	0,	0,	CPU_686,	0,	0
 cmovnbel,	cmovcc_insn,	3,	SUF_L,	0x07,	0,	0,	0,	CPU_686,	0,	0
 cmovnbeq,	cmovcc_insn,	3,	SUF_Q,	0x07,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovnbew,	cmovcc_insn,	3,	SUF_W,	0x07,	0,	0,	0,	CPU_686,	0,	0
+cmovnbl,	cmovcc_insn,	3,	SUF_L,	0x03,	0,	0,	0,	CPU_686,	0,	0
+cmovnbq,	cmovcc_insn,	3,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovnbw,	cmovcc_insn,	3,	SUF_W,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovnc,	cmovcc_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovncl,	cmovcc_insn,	3,	SUF_L,	0x03,	0,	0,	0,	CPU_686,	0,	0
 cmovncq,	cmovcc_insn,	3,	SUF_Q,	0x03,	0,	0,	ONLY_64,	CPU_686,	0,	0
@@ -168,21 +186,21 @@
 cmovneq,	cmovcc_insn,	3,	SUF_Q,	0x05,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovnew,	cmovcc_insn,	3,	SUF_W,	0x05,	0,	0,	0,	CPU_686,	0,	0
 cmovng,	cmovcc_insn,	3,	SUF_Z,	0x0E,	0,	0,	0,	CPU_686,	0,	0
-cmovngl,	cmovcc_insn,	3,	SUF_L,	0x0E,	0,	0,	0,	CPU_686,	0,	0
-cmovngq,	cmovcc_insn,	3,	SUF_Q,	0x0E,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovngw,	cmovcc_insn,	3,	SUF_W,	0x0E,	0,	0,	0,	CPU_686,	0,	0
 cmovnge,	cmovcc_insn,	3,	SUF_Z,	0x0C,	0,	0,	0,	CPU_686,	0,	0
 cmovngel,	cmovcc_insn,	3,	SUF_L,	0x0C,	0,	0,	0,	CPU_686,	0,	0
 cmovngeq,	cmovcc_insn,	3,	SUF_Q,	0x0C,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovngew,	cmovcc_insn,	3,	SUF_W,	0x0C,	0,	0,	0,	CPU_686,	0,	0
+cmovngl,	cmovcc_insn,	3,	SUF_L,	0x0E,	0,	0,	0,	CPU_686,	0,	0
+cmovngq,	cmovcc_insn,	3,	SUF_Q,	0x0E,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovngw,	cmovcc_insn,	3,	SUF_W,	0x0E,	0,	0,	0,	CPU_686,	0,	0
 cmovnl,	cmovcc_insn,	3,	SUF_Z,	0x0D,	0,	0,	0,	CPU_686,	0,	0
-cmovnll,	cmovcc_insn,	3,	SUF_L,	0x0D,	0,	0,	0,	CPU_686,	0,	0
-cmovnlq,	cmovcc_insn,	3,	SUF_Q,	0x0D,	0,	0,	ONLY_64,	CPU_686,	0,	0
-cmovnlw,	cmovcc_insn,	3,	SUF_W,	0x0D,	0,	0,	0,	CPU_686,	0,	0
 cmovnle,	cmovcc_insn,	3,	SUF_Z,	0x0F,	0,	0,	0,	CPU_686,	0,	0
 cmovnlel,	cmovcc_insn,	3,	SUF_L,	0x0F,	0,	0,	0,	CPU_686,	0,	0
 cmovnleq,	cmovcc_insn,	3,	SUF_Q,	0x0F,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovnlew,	cmovcc_insn,	3,	SUF_W,	0x0F,	0,	0,	0,	CPU_686,	0,	0
+cmovnll,	cmovcc_insn,	3,	SUF_L,	0x0D,	0,	0,	0,	CPU_686,	0,	0
+cmovnlq,	cmovcc_insn,	3,	SUF_Q,	0x0D,	0,	0,	ONLY_64,	CPU_686,	0,	0
+cmovnlw,	cmovcc_insn,	3,	SUF_W,	0x0D,	0,	0,	0,	CPU_686,	0,	0
 cmovno,	cmovcc_insn,	3,	SUF_Z,	0x01,	0,	0,	0,	CPU_686,	0,	0
 cmovnol,	cmovcc_insn,	3,	SUF_L,	0x01,	0,	0,	0,	CPU_686,	0,	0
 cmovnoq,	cmovcc_insn,	3,	SUF_Q,	0x01,	0,	0,	ONLY_64,	CPU_686,	0,	0
@@ -204,17 +222,17 @@
 cmovoq,	cmovcc_insn,	3,	SUF_Q,	0x00,	0,	0,	ONLY_64,	CPU_686,	0,	0
 cmovow,	cmovcc_insn,	3,	SUF_W,	0x00,	0,	0,	0,	CPU_686,	0,	0

yasm-1.1.0.tar.gz/x86insn_nasm.gperf -> yasm-1.2.0.tar.gz/x86insn_nasm.gperf Changed

@@ -1,4 +1,4 @@
-/* Generated by gen_x86_insn.py r2346, do not edit */
+/* Generated by gen_x86_insn.py rHEAD, do not edit */
 %ignore-case
 %language=ANSI-C
 %compare-strncmp
@@ -31,15 +31,20 @@
 aesimc,	aesimc_insn,	1,	SUF_Z,	0x38,	0xDB,	0,	0,	CPU_AES,	0,	0
 aeskeygenassist,	aes_imm_insn,	1,	SUF_Z,	0x3A,	0xDF,	0,	0,	CPU_AES,	0,	0
 and,	arith_insn,	22,	SUF_Z,	0x20,	0x04,	0,	0,	0,	0,	0
+andn,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF2,	ONLY_AVX,	CPU_BMI1,	0,	0
 andnpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x55,	0,	0,	CPU_SSE2,	0,	0
 andnps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x55,	0,	0,	CPU_SSE,	0,	0
 andpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x54,	0,	0,	CPU_SSE2,	0,	0
 andps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x54,	0,	0,	CPU_SSE,	0,	0
 arpl,	arpl_insn,	1,	SUF_Z,	0,	0,	0,	NOT_64,	CPU_286,	CPU_Prot,	0
+bextr,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF7,	ONLY_AVX,	CPU_BMI1,	0,	0
 blendpd,	sse4imm_insn,	2,	SUF_Z,	0x0D,	0,	0,	0,	CPU_SSE41,	0,	0
 blendps,	sse4imm_insn,	2,	SUF_Z,	0x0C,	0,	0,	0,	CPU_SSE41,	0,	0
 blendvpd,	sse4xmm0_insn,	2,	SUF_Z,	0x15,	0,	0,	0,	CPU_SSE41,	0,	0
 blendvps,	sse4xmm0_insn,	2,	SUF_Z,	0x14,	0,	0,	0,	CPU_SSE41,	0,	0
+blsi,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x03,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsmsk,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x02,	ONLY_AVX,	CPU_BMI1,	0,	0
+blsr,	vex_gpr_ndd_rm_0F38_regext_insn,	2,	SUF_Z,	0x00,	0xF3,	0x01,	ONLY_AVX,	CPU_BMI1,	0,	0
 bound,	bound_insn,	2,	SUF_Z,	0,	0,	0,	NOT_64,	CPU_186,	0,	0
 bsf,	bsfr_insn,	3,	SUF_Z,	0xBC,	0,	0,	0,	CPU_386,	0,	0
 bsr,	bsfr_insn,	3,	SUF_Z,	0xBD,	0,	0,	0,	CPU_386,	0,	0
@@ -48,6 +53,7 @@
 btc,	bittest_insn,	6,	SUF_Z,	0xBB,	0x07,	0,	0,	CPU_386,	0,	0
 btr,	bittest_insn,	6,	SUF_Z,	0xB3,	0x06,	0,	0,	CPU_386,	0,	0
 bts,	bittest_insn,	6,	SUF_Z,	0xAB,	0x05,	0,	0,	CPU_386,	0,	0
+bzhi,	vex_gpr_reg_rm_nds_0F_insn,	2,	SUF_Z,	0x00,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
 call,	call_insn,	30,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 cbw,	onebyte_insn,	1,	SUF_Z,	0x98,	0x10,	0,	0,	0,	0,	0
 cdq,	onebyte_insn,	1,	SUF_Z,	0x99,	0x20,	0,	0,	CPU_386,	0,	0
@@ -300,6 +306,7 @@
 invept,	eptvpid_insn,	2,	SUF_Z,	0x00,	0,	0,	0,	CPU_386,	CPU_EPTVPID,	0
 invlpg,	twobytemem_insn,	1,	SUF_Z,	0x07,	0x0F,	0x01,	0,	CPU_486,	CPU_Priv,	0
 invlpga,	invlpga_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SVM,	0,	0
+invpcid,	invpcid_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_386,	CPU_INVPCID,	CPU_Priv
 invvpid,	eptvpid_insn,	2,	SUF_Z,	0x01,	0,	0,	0,	CPU_386,	CPU_EPTVPID,	0
 iret,	onebyte_insn,	1,	SUF_Z,	0xCF,	0,	0,	0,	0,	0,	0
 iretd,	onebyte_insn,	1,	SUF_Z,	0xCF,	0x20,	0,	0,	CPU_386,	0,	0
@@ -340,7 +347,7 @@
 js,	jcc_insn,	9,	SUF_Z,	0x08,	0,	0,	0,	0,	0,	0
 jz,	jcc_insn,	9,	SUF_Z,	0x04,	0,	0,	0,	0,	0,	0
 lahf,	onebyte_insn,	1,	SUF_Z,	0x9F,	0,	0,	0,	0,	0,	0
-lar,	bsfr_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+lar,	larlsl_insn,	6,	SUF_Z,	0x02,	0,	0,	0,	CPU_286,	CPU_Prot,	0
 lddqu,	lddqu_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SSE3,	0,	0
 ldmxcsr,	ldstmxcsr_insn,	1,	SUF_Z,	0x02,	0,	0,	0,	CPU_SSE,	0,	0
 lds,	ldes_insn,	2,	SUF_Z,	0xC5,	0,	0,	NOT_64,	0,	0,	0
@@ -348,9 +355,9 @@
 leave,	onebyte_insn,	1,	SUF_Z,	0xC9,	0x00,	0x40,	0,	CPU_186,	0,	0
 les,	ldes_insn,	2,	SUF_Z,	0xC4,	0,	0,	NOT_64,	0,	0,	0
 lfence,	threebyte_insn,	1,	SUF_Z,	0x0F,	0xAE,	0xE8,	0,	CPU_P3,	0,	0
-lfs,	lfgss_insn,	2,	SUF_Z,	0xB4,	0,	0,	0,	CPU_386,	0,	0
+lfs,	lfgss_insn,	3,	SUF_Z,	0xB4,	0,	0,	0,	CPU_386,	0,	0
 lgdt,	twobytemem_insn,	1,	SUF_Z,	0x02,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
-lgs,	lfgss_insn,	2,	SUF_Z,	0xB5,	0,	0,	0,	CPU_386,	0,	0
+lgs,	lfgss_insn,	3,	SUF_Z,	0xB5,	0,	0,	0,	CPU_386,	0,	0
 lidt,	twobytemem_insn,	1,	SUF_Z,	0x03,	0x0F,	0x01,	0,	CPU_286,	CPU_Priv,	0
 lldt,	prot286_insn,	1,	SUF_Z,	0x02,	0x00,	0,	0,	CPU_286,	CPU_Priv,	CPU_Prot
 lmsw,	prot286_insn,	1,	SUF_Z,	0x06,	0x01,	0,	0,	CPU_286,	CPU_Priv,	0
@@ -366,10 +373,10 @@
 loopne,	loop_insn,	8,	SUF_Z,	0x00,	0,	0,	0,	0,	0,	0
 loopnz,	loop_insn,	8,	SUF_Z,	0x00,	0,	0,	0,	0,	0,	0
 loopz,	loop_insn,	8,	SUF_Z,	0x01,	0,	0,	0,	0,	0,	0
-lsl,	bsfr_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
-lss,	lfgss_insn,	2,	SUF_Z,	0xB2,	0,	0,	0,	CPU_386,	0,	0
+lsl,	larlsl_insn,	6,	SUF_Z,	0x03,	0,	0,	0,	CPU_286,	CPU_Prot,	0
+lss,	lfgss_insn,	3,	SUF_Z,	0xB2,	0,	0,	0,	CPU_386,	0,	0
 ltr,	prot286_insn,	1,	SUF_Z,	0x03,	0x00,	0,	0,	CPU_286,	CPU_Priv,	CPU_Prot
-lzcnt,	cnt_insn,	3,	SUF_Z,	0xBD,	0,	0,	0,	CPU_686,	CPU_AMD,	0
+lzcnt,	cnt_insn,	3,	SUF_Z,	0xBD,	0,	0,	0,	CPU_LZCNT,	0,	0
 maskmovdqu,	maskmovdqu_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE2,	0,	0
 maskmovq,	maskmovq_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
 maxpd,	xmm_xmm128_insn,	2,	SUF_Z,	0x66,	0x5F,	0,	0,	CPU_SSE2,	0,	0
@@ -401,7 +408,7 @@
 movmskpd,	movmsk_insn,	4,	SUF_Z,	0x66,	0,	0,	0,	CPU_SSE2,	0,	0
 movmskps,	movmsk_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_386,	CPU_SSE,	0
 movntdq,	movnt_insn,	2,	SUF_Z,	0x66,	0xE7,	0,	0,	CPU_SSE2,	0,	0
-movntdqa,	movntdqa_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
+movntdqa,	movntdqa_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
 movnti,	movnti_insn,	2,	SUF_Z,	0,	0,	0,	0,	CPU_P4,	0,	0
 movntpd,	movnt_insn,	2,	SUF_Z,	0x66,	0x2B,	0,	0,	CPU_SSE2,	0,	0
 movntps,	movnt_insn,	2,	SUF_Z,	0x00,	0x2B,	0,	0,	CPU_SSE,	0,	0
@@ -428,6 +435,7 @@
 mulps,	xmm_xmm128_insn,	2,	SUF_Z,	0x00,	0x59,	0,	0,	CPU_SSE,	0,	0
 mulsd,	xmm_xmm64_insn,	4,	SUF_Z,	0xF2,	0x59,	0,	0,	CPU_SSE2,	0,	0
 mulss,	xmm_xmm32_insn,	4,	SUF_Z,	0xF3,	0x59,	0,	0,	CPU_SSE,	0,	0
+mulx,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0xF2,	0x38,	0xF6,	ONLY_AVX,	CPU_BMI2,	0,	0
 mwait,	threebyte_insn,	1,	SUF_Z,	0x0F,	0x01,	0xC9,	0,	CPU_SSE3,	0,	0
 neg,	f6_insn,	4,	SUF_Z,	0x03,	0,	0,	0,	0,	0,	0
 nop,	onebyte_insn,	1,	SUF_Z,	0x90,	0,	0,	0,	0,	0,	0
@@ -442,9 +450,9 @@
 outsb,	onebyte_insn,	1,	SUF_Z,	0x6E,	0x00,	0,	0,	0,	0,	0
 outsd,	onebyte_insn,	1,	SUF_Z,	0x6F,	0x20,	0,	0,	CPU_386,	0,	0
 outsw,	onebyte_insn,	1,	SUF_Z,	0x6F,	0x10,	0,	0,	0,	0,	0
-pabsb,	ssse3_insn,	3,	SUF_Z,	0x1C,	0,	0,	0,	CPU_SSSE3,	0,	0
-pabsd,	ssse3_insn,	3,	SUF_Z,	0x1E,	0,	0,	0,	CPU_SSSE3,	0,	0
-pabsw,	ssse3_insn,	3,	SUF_Z,	0x1D,	0,	0,	0,	CPU_SSSE3,	0,	0
+pabsb,	ssse3_insn,	5,	SUF_Z,	0x1C,	0,	0,	0,	CPU_SSSE3,	0,	0
+pabsd,	ssse3_insn,	5,	SUF_Z,	0x1E,	0,	0,	0,	CPU_SSSE3,	0,	0
+pabsw,	ssse3_insn,	5,	SUF_Z,	0x1D,	0,	0,	0,	CPU_SSSE3,	0,	0
 packssdw,	mmxsse2_insn,	2,	SUF_Z,	0x6B,	0,	0,	0,	CPU_MMX,	0,	0
 packsswb,	mmxsse2_insn,	2,	SUF_Z,	0x63,	0,	0,	0,	CPU_MMX,	0,	0
 packusdw,	sse4_insn,	2,	SUF_Z,	0x2B,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -485,7 +493,9 @@
 pcmpgtw,	mmxsse2_insn,	2,	SUF_Z,	0x65,	0,	0,	0,	CPU_MMX,	0,	0
 pcmpistri,	sse4pcmpstr_insn,	1,	SUF_Z,	0x63,	0,	0,	0,	CPU_SSE42,	0,	0
 pcmpistrm,	sse4pcmpstr_insn,	1,	SUF_Z,	0x62,	0,	0,	0,	CPU_SSE42,	0,	0
+pdep,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0xF2,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
 pdistib,	cyrixmmx_insn,	1,	SUF_Z,	0x54,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
+pext,	vex_gpr_reg_nds_rm_0F_insn,	2,	SUF_Z,	0xF3,	0x38,	0xF5,	ONLY_AVX,	CPU_BMI2,	0,	0
 pextrb,	pextrb_insn,	3,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
 pextrd,	pextrd_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_386,	CPU_SSE41,	0
 pextrq,	pextrq_insn,	1,	SUF_Z,	0,	0,	0,	ONLY_64,	CPU_SSE41,	0,	0
@@ -509,13 +519,13 @@
 pfrsqrt,	now3d_insn,	1,	SUF_Z,	0x97,	0,	0,	0,	CPU_3DNow,	0,	0
 pfsub,	now3d_insn,	1,	SUF_Z,	0x9A,	0,	0,	0,	CPU_3DNow,	0,	0
 pfsubr,	now3d_insn,	1,	SUF_Z,	0xAA,	0,	0,	0,	CPU_3DNow,	0,	0
-phaddd,	ssse3_insn,	3,	SUF_Z,	0x02,	0,	0,	0,	CPU_SSSE3,	0,	0
-phaddsw,	ssse3_insn,	3,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSSE3,	0,	0
-phaddw,	ssse3_insn,	3,	SUF_Z,	0x01,	0,	0,	0,	CPU_SSSE3,	0,	0
+phaddd,	ssse3_insn,	5,	SUF_Z,	0x02,	0,	0,	0,	CPU_SSSE3,	0,	0
+phaddsw,	ssse3_insn,	5,	SUF_Z,	0x03,	0,	0,	0,	CPU_SSSE3,	0,	0
+phaddw,	ssse3_insn,	5,	SUF_Z,	0x01,	0,	0,	0,	CPU_SSSE3,	0,	0
 phminposuw,	sse4_insn,	2,	SUF_Z,	0x41,	0,	0,	0,	CPU_SSE41,	0,	0
-phsubd,	ssse3_insn,	3,	SUF_Z,	0x06,	0,	0,	0,	CPU_SSSE3,	0,	0
-phsubsw,	ssse3_insn,	3,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSSE3,	0,	0
-phsubw,	ssse3_insn,	3,	SUF_Z,	0x05,	0,	0,	0,	CPU_SSSE3,	0,	0
+phsubd,	ssse3_insn,	5,	SUF_Z,	0x06,	0,	0,	0,	CPU_SSSE3,	0,	0
+phsubsw,	ssse3_insn,	5,	SUF_Z,	0x07,	0,	0,	0,	CPU_SSSE3,	0,	0
+phsubw,	ssse3_insn,	5,	SUF_Z,	0x05,	0,	0,	0,	CPU_SSSE3,	0,	0
 pi2fd,	now3d_insn,	1,	SUF_Z,	0x0D,	0,	0,	0,	CPU_3DNow,	0,	0
 pi2fw,	now3d_insn,	1,	SUF_Z,	0x0C,	0,	0,	0,	CPU_3DNow,	CPU_Athlon,	0
 pinsrb,	pinsrb_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -523,7 +533,7 @@
 pinsrq,	pinsrq_insn,	2,	SUF_Z,	0,	0,	0,	ONLY_64,	CPU_SSE41,	0,	0
 pinsrw,	pinsrw_insn,	9,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
 pmachriw,	pmachriw_insn,	1,	SUF_Z,	0,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
-pmaddubsw,	ssse3_insn,	3,	SUF_Z,	0x04,	0,	0,	0,	CPU_SSSE3,	0,	0
+pmaddubsw,	ssse3_insn,	5,	SUF_Z,	0x04,	0,	0,	0,	CPU_SSSE3,	0,	0
 pmaddwd,	mmxsse2_insn,	2,	SUF_Z,	0xF5,	0,	0,	0,	CPU_MMX,	0,	0
 pmagw,	cyrixmmx_insn,	1,	SUF_Z,	0x52,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmaxsb,	sse4_insn,	2,	SUF_Z,	0x3C,	0,	0,	0,	CPU_SSE41,	0,	0
@@ -538,22 +548,22 @@
 pminub,	mmxsse2_insn,	2,	SUF_Z,	0xDA,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
 pminud,	sse4_insn,	2,	SUF_Z,	0x3B,	0,	0,	0,	CPU_SSE41,	0,	0
 pminuw,	sse4_insn,	2,	SUF_Z,	0x3A,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovmskb,	pmovmskb_insn,	4,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
-pmovsxbd,	sse4m32_insn,	2,	SUF_Z,	0x21,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxbq,	sse4m16_insn,	2,	SUF_Z,	0x22,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxbw,	sse4m64_insn,	2,	SUF_Z,	0x20,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxdq,	sse4m64_insn,	2,	SUF_Z,	0x25,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxwd,	sse4m64_insn,	2,	SUF_Z,	0x23,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovsxwq,	sse4m32_insn,	2,	SUF_Z,	0x24,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxbd,	sse4m32_insn,	2,	SUF_Z,	0x31,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxbq,	sse4m16_insn,	2,	SUF_Z,	0x32,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxbw,	sse4m64_insn,	2,	SUF_Z,	0x30,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxdq,	sse4m64_insn,	2,	SUF_Z,	0x35,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxwd,	sse4m64_insn,	2,	SUF_Z,	0x33,	0,	0,	0,	CPU_SSE41,	0,	0
-pmovzxwq,	sse4m32_insn,	2,	SUF_Z,	0x34,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovmskb,	pmovmskb_insn,	6,	SUF_Z,	0,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
+pmovsxbd,	sse4m32_insn,	4,	SUF_Z,	0x21,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxbq,	sse4m16_insn,	4,	SUF_Z,	0x22,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxbw,	sse4m64_insn,	4,	SUF_Z,	0x20,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxdq,	sse4m64_insn,	4,	SUF_Z,	0x25,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxwd,	sse4m64_insn,	4,	SUF_Z,	0x23,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovsxwq,	sse4m32_insn,	4,	SUF_Z,	0x24,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxbd,	sse4m32_insn,	4,	SUF_Z,	0x31,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxbq,	sse4m16_insn,	4,	SUF_Z,	0x32,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxbw,	sse4m64_insn,	4,	SUF_Z,	0x30,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxdq,	sse4m64_insn,	4,	SUF_Z,	0x35,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxwd,	sse4m64_insn,	4,	SUF_Z,	0x33,	0,	0,	0,	CPU_SSE41,	0,	0
+pmovzxwq,	sse4m32_insn,	4,	SUF_Z,	0x34,	0,	0,	0,	CPU_SSE41,	0,	0
 pmuldq,	sse4_insn,	2,	SUF_Z,	0x28,	0,	0,	0,	CPU_SSE41,	0,	0
 pmulhriw,	cyrixmmx_insn,	1,	SUF_Z,	0x5D,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
-pmulhrsw,	ssse3_insn,	3,	SUF_Z,	0x0B,	0,	0,	0,	CPU_SSSE3,	0,	0
+pmulhrsw,	ssse3_insn,	5,	SUF_Z,	0x0B,	0,	0,	0,	CPU_SSSE3,	0,	0
 pmulhrwa,	now3d_insn,	1,	SUF_Z,	0xB7,	0,	0,	0,	CPU_3DNow,	0,	0
 pmulhrwc,	cyrixmmx_insn,	1,	SUF_Z,	0x59,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmulhuw,	mmxsse2_insn,	2,	SUF_Z,	0xE4,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
@@ -565,7 +575,7 @@
 pmvlzb,	cyrixmmx_insn,	1,	SUF_Z,	0x5B,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmvnzb,	cyrixmmx_insn,	1,	SUF_Z,	0x5A,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
 pmvzb,	cyrixmmx_insn,	1,	SUF_Z,	0x58,	0,	0,	0,	CPU_Cyrix,	CPU_MMX,	0
-pop,	pop_insn,	21,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
+pop,	pop_insn,	23,	SUF_Z,	0,	0,	0,	0,	0,	0,	0
 popa,	onebyte_insn,	1,	SUF_Z,	0x61,	0x00,	0,	NOT_64,	CPU_186,	0,	0
 popad,	onebyte_insn,	1,	SUF_Z,	0x61,	0x20,	0,	NOT_64,	CPU_386,	0,	0
 popaw,	onebyte_insn,	1,	SUF_Z,	0x61,	0x10,	0,	NOT_64,	CPU_186,	0,	0
@@ -582,22 +592,22 @@
 prefetcht2,	twobytemem_insn,	1,	SUF_Z,	0x03,	0x0F,	0x18,	0,	CPU_P3,	0,	0
 prefetchw,	twobytemem_insn,	1,	SUF_Z,	0x01,	0x0F,	0x0D,	0,	CPU_3DNow,	0,	0
 psadbw,	mmxsse2_insn,	2,	SUF_Z,	0xF6,	0,	0,	0,	CPU_MMX,	CPU_P3,	0
-pshufb,	ssse3_insn,	3,	SUF_Z,	0x00,	0,	0,	0,	CPU_SSSE3,	0,	0
+pshufb,	ssse3_insn,	5,	SUF_Z,	0x00,	0,	0,	0,	CPU_SSSE3,	0,	0
 pshufd,	xmm_xmm128_imm_insn,	1,	SUF_Z,	0x66,	0x70,	0,	0,	CPU_SSE2,	0,	0

yasm-1.1.0.tar.gz/x86insns.c -> yasm-1.2.0.tar.gz/x86insns.c Changed

@@ -1,4 +1,4 @@
-/* Generated by gen_x86_insn.py r2346, do not edit */
+/* Generated by gen_x86_insn.py rHEAD, do not edit */
 static const x86_info_operand insn_operands[] = {
    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
@@ -10,6 +10,18 @@
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
@@ -26,10 +38,6 @@
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
@@ -56,18 +64,18 @@
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
+    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_Mem, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
@@ -82,15 +90,7 @@
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEXImmSrc, OPAP_None},
-    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
@@ -134,15 +134,30 @@
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_Mem, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDRM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_Mem, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_Mem, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
@@ -182,11 +197,11 @@
     {OPT_Mem, OPS_8, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
-    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
-    {OPT_SIMDReg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_SIMDRM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
+    {OPT_SIMDRM, OPS_256, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
@@ -206,12 +221,39 @@
     {OPT_Mem, OPS_128, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemXMMIndex, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemXMMIndex, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
     {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_SpareVEX, OPAP_None},
+    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_XMM0, OPS_128, 0, 0, OPTM_None, OPA_None, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemXMMIndex, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemYMMIndex, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_MemYMMIndex, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_RM, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
+    {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_RM, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Reg, OPS_16, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
@@ -230,9 +272,9 @@
     {OPT_RM, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Creg, OPS_8, 0, 0, OPTM_None, OPA_None, OPAP_None},
-    {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
-    {OPT_Imm, OPS_8, 1, 0, OPTM_None, OPA_Imm, OPAP_None},
+    {OPT_MemYMMIndex, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_VEX, OPAP_None},
     {OPT_RM, OPS_32, 0, 0, OPTM_None, OPA_EA, OPAP_None},
@@ -401,11 +443,23 @@
     {OPT_SIMDReg, OPS_64, 0, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Mem, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Mem, OPS_32, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_128, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Mem, OPS_64, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_SIMDReg, OPS_256, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_SIMDRM, OPS_128, 1, 0, OPTM_None, OPA_EA, OPAP_None},
     {OPT_Reg, OPS_16, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_16, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_Reg, OPS_32, 0, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_64, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
+    {OPT_RM, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},
+    {OPT_Reg, OPS_16, 0, 0, OPTM_None, OPA_Spare, OPAP_None},
     {OPT_Mem, OPS_16, 1, 0, OPTM_None, OPA_EA, OPAP_None},

yasm-1.1.0.tar.gz/yasm.1 -> yasm-1.2.0.tar.gz/yasm.1 Changed

@@ -1,47 +1,55 @@
+'\" t
 .\"     Title: yasm
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: April 2007
 .\"    Manual: The Yasm Modular Assembler
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM" "1" "April 2007" "Yasm" "The Yasm Modular Assembler"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm \- The Yasm Modular Assembler
 .SH "SYNOPSIS"
-.HP 5
+.HP \w'\fByasm\fR\ 'u
 \fByasm\fR [\fB\-f\ \fR\fB\fIformat\fR\fR] [\fB\-o\ \fR\fB\fIoutfile\fR\fR] [\fB\fIother\ options\fR\fR...] {\fIinfile\fR}
-.HP 5
+.HP \w'\fByasm\fR\ 'u
 \fByasm\fR \fB\-h\fR
 .SH "DESCRIPTION"
 .PP
 The Yasm Modular Assembler is a portable, retargetable assembler written under the
 \(lqnew\(rq
-(2 or 3 clause) BSD license. Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats.
+(2 or 3 clause) BSD license\&. Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, COFF, Win32, and Win64 object formats, and generates source debugging information in STABS, DWARF 2, and CodeView 8 formats\&.
 .PP
 YASM consists of the
 \fByasm\fR
-command, libyasm, the core backend library, and a large number of modules. Currently, libyasm and the loadable modules are statically built into the
+command, libyasm, the core backend library, and a large number of modules\&. Currently, libyasm and the loadable modules are statically built into the
 \fByasm\fR
-executable.
+executable\&.
 .PP
 The
 \fByasm\fR
 command assembles the file infile and directs output to the file
 \fIoutfile\fR
-if specified. If
+if specified\&. If
 \fIoutfile\fR
 is not specified,
 \fByasm\fR
 will derive a default output file name from the name of its input file, usually by appending
-\fI.o\fR
+\&.o
 or
-\fI.obj\fR, or by removing all extensions for a raw binary file. Failing that, the output file name will be
-\fIyasm.out\fR.
+\&.obj, or by removing all extensions for a raw binary file\&. Failing that, the output file name will be
+yasm\&.out\&.
 .PP
 If called with an
 \fIinfile\fR
@@ -50,115 +58,115 @@
 \fByasm\fR
 assembles the standard input and directs output to the file
 \fIoutfile\fR, or
-\fIyasm.out\fR
+yasm\&.out
 if no
 \fIoutfile\fR
-is specified.
+is specified\&.
 .SH "OPTIONS"
 .PP
-Many options may be given in one of two forms: either a dash followed by a single letter, or two dashes followed by a long option name. Options are listed in alphabetical order.
+Many options may be given in one of two forms: either a dash followed by a single letter, or two dashes followed by a long option name\&. Options are listed in alphabetical order\&.
 .SS "General Options"
 .PP
 \fB\-a \fR\fB\fIarch\fR\fR or \fB\-\-arch=\fR\fB\fIarch\fR\fR: Select target architecture
 .RS 4
-Selects the target architecture. The default architecture is
-\(lqx86\(rq, which supports both the IA\-32 and derivatives and AMD64 instruction sets. To print a list of available architectures to standard output, use
+Selects the target architecture\&. The default architecture is
+\(lqx86\(rq, which supports both the IA\-32 and derivatives and AMD64 instruction sets\&. To print a list of available architectures to standard output, use
 \(lqhelp\(rq
 as
-\fIarch\fR. See
+\fIarch\fR\&. See
 \fByasm_arch\fR(7)
-for a list of supported architectures.
+for a list of supported architectures\&.
 .RE
 .PP
 \fB\-f \fR\fB\fIformat\fR\fR or \fB\-\-oformat=\fR\fB\fIformat\fR\fR: Select object format
 .RS 4
-Selects the output object format. The default object format is
-\(lqbin\(rq, which is a flat format binary with no relocation. To print a list of available object formats to standard output, use
+Selects the output object format\&. The default object format is
+\(lqbin\(rq, which is a flat format binary with no relocation\&. To print a list of available object formats to standard output, use
 \(lqhelp\(rq
 as
-\fIformat\fR. See
+\fIformat\fR\&. See
 \fByasm_objfmts\fR(7)
-for a list of supported object formats.
+for a list of supported object formats\&.
 .RE
 .PP
 \fB\-g \fR\fB\fIdebug\fR\fR or \fB\-\-dformat=\fR\fB\fIdebug\fR\fR: Select debugging format
 .RS 4
-Selects the debugging format for debug information. Debugging information can be used by a debugger to associate executable code back to the source file or get data structure and type information. Available debug formats vary between different object formats;
+Selects the debugging format for debug information\&. Debugging information can be used by a debugger to associate executable code back to the source file or get data structure and type information\&. Available debug formats vary between different object formats;
 \fByasm\fR
-will error when an invalid combination is selected. The default object format is selected by the object format. To print a list of available debugging formats to standard output, use
+will error when an invalid combination is selected\&. The default object format is selected by the object format\&. To print a list of available debugging formats to standard output, use
 \(lqhelp\(rq
 as
-\fIdebug\fR. See
+\fIdebug\fR\&. See
 \fByasm_dbgfmts\fR(7)
-for a list of supported debugging formats.
-.RE
-.PP
-\fB\-h\fR or \fB\-\-help\fR: Print a summary of options
-.RS 4
-Prints a summary of invocation options. All other options are ignored, and no output file is generated.
+for a list of supported debugging formats\&.
 .RE
 .PP
 \fB\-L \fR\fB\fIlist\fR\fR or \fB\-\-lformat=\fR\fB\fIlist\fR\fR: Select list file format
 .RS 4
-Selects the format/style of the output list file. List files typically intermix the original source with the machine code generated by the assembler. The default list format is
-\(lqnasm\(rq, which mimics the NASM list file format. To print a list of available list file formats to standard output, use
+Selects the format/style of the output list file\&. List files typically intermix the original source with the machine code generated by the assembler\&. The default list format is
+\(lqnasm\(rq, which mimics the NASM list file format\&. To print a list of available list file formats to standard output, use
 \(lqhelp\(rq
 as
-\fIlist\fR.
+\fIlist\fR\&.
 .RE
 .PP
 \fB\-l \fR\fB\fIlistfile\fR\fR or \fB\-\-list=\fR\fB\fIlistfile\fR\fR: Specify list filename
 .RS 4
-Specifies the name of the output list file. If this option is not used, no list file is generated.
+Specifies the name of the output list file\&. If this option is not used, no list file is generated\&.
 .RE
 .PP
 \fB\-m \fR\fB\fImachine\fR\fR or \fB\-\-machine=\fR\fB\fImachine\fR\fR: Select target machine architecture
 .RS 4
-Selects the target machine architecture. Essentially a subtype of the selected architecture, the machine type selects between major subsets of an architecture. For example, for the
+Selects the target machine architecture\&. Essentially a subtype of the selected architecture, the machine type selects between major subsets of an architecture\&. For example, for the
 \(lqx86\(rq
 architecture, the two available machines are
 \(lqx86\(rq, which is used for the IA\-32 and derivative 32\-bit instruction set, and
-\(lqamd64\(rq, which is used for the 64\-bit instruction set. This differentiation is required to generate the proper object file for relocatable object formats such as COFF and ELF. To print a list of available machines for a given architecture to standard output, use
+\(lqamd64\(rq, which is used for the 64\-bit instruction set\&. This differentiation is required to generate the proper object file for relocatable object formats such as COFF and ELF\&. To print a list of available machines for a given architecture to standard output, use
 \(lqhelp\(rq
 as
 \fImachine\fR
 and the given architecture using
-\fB\-a \fR\fB\fIarch\fR\fR. See
+\fB\-a \fR\fB\fIarch\fR\fR\&. See
 \fByasm_arch\fR(7)
-for more details.
+for more details\&.
 .RE
 .PP
 \fB\-o \fR\fB\fIfilename\fR\fR or \fB\-\-objfile=\fR\fB\fIfilename\fR\fR: Specify object filename
 .RS 4
-Specifies the name of the output file, overriding any default name generated by Yasm.
+Specifies the name of the output file, overriding any default name generated by Yasm\&.
 .RE
 .PP
 \fB\-p \fR\fB\fIparser\fR\fR or \fB\-\-parser=\fR\fB\fIparser\fR\fR: Select parser
 .RS 4
-Selects the parser (the assembler syntax). The default parser is
-\(lqnasm\(rq, which emulates the syntax of NASM, the Netwide Assembler. Another available parser is
-\(lqgas\(rq, which emulates the syntax of GNU AS. To print a list of available parsers to standard output, use
+Selects the parser (the assembler syntax)\&. The default parser is
+\(lqnasm\(rq, which emulates the syntax of NASM, the Netwide Assembler\&. Another available parser is
+\(lqgas\(rq, which emulates the syntax of GNU AS\&. To print a list of available parsers to standard output, use
 \(lqhelp\(rq
 as
-\fIparser\fR. See
+\fIparser\fR\&. See
 \fByasm_parsers\fR(7)
-for a list of supported parsers.
+for a list of supported parsers\&.
 .RE
 .PP
 \fB\-r \fR\fB\fIpreproc\fR\fR or \fB\-\-preproc=\fR\fB\fIpreproc\fR\fR: Select preprocessor
 .RS 4
-Selects the preprocessor to use on the input file before passing it to the parser. Preprocessors often provide macro functionality that is not included in the main parser. The default preprocessor is
-\(lqnasm\(rq, which is an imported version of the actual NASM preprocessor. A
+Selects the preprocessor to use on the input file before passing it to the parser\&. Preprocessors often provide macro functionality that is not included in the main parser\&. The default preprocessor is
+\(lqnasm\(rq, which is an imported version of the actual NASM preprocessor\&. A

yasm-1.1.0.tar.gz/yasm_arch.7 -> yasm-1.2.0.tar.gz/yasm_arch.7 Changed

@@ -1,23 +1,31 @@
+'\" t
 .\"     Title: yasm_arch
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: October 2006
 .\"    Manual: Yasm Supported Architectures
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM_ARCH" "7" "October 2006" "Yasm" "Yasm Supported Architectures"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm_arch \- Yasm Supported Target Architectures
 .SH "SYNOPSIS"
-.HP 5
-\fByasm\fR \fB\-a\ \fR\fB\fIarch\fR\fR [\fB\-m\ \fR\fB\fImachine\fR\fR] \fB\fI...\fR\fR
+.HP \w'\fByasm\fR\ 'u
+\fByasm\fR \fB\-a\ \fR\fB\fIarch\fR\fR [\fB\-m\ \fR\fB\fImachine\fR\fR] \fB\fI\&.\&.\&.\fR\fR
 .SH "DESCRIPTION"
 .PP
-The standard Yasm distribution includes a number of modules for different target architectures. Each target architecture can support one or more machine architectures.
+The standard Yasm distribution includes a number of modules for different target architectures\&. Each target architecture can support one or more machine architectures\&.
 .PP
 The architecture and machine are selected on the
 \fByasm\fR(1)
@@ -25,9 +33,9 @@
 \fB\-a \fR\fB\fIarch\fR\fR
 and
 \fB\-m \fR\fB\fImachine\fR\fR
-command line options, respectively.
+command line options, respectively\&.
 .PP
-The machine architecture may also automatically be selected by certain object formats. For example, the
+The machine architecture may also automatically be selected by certain object formats\&. For example, the
 \(lqelf32\(rq
 object format selects the
 \(lqx86\(rq
@@ -35,367 +43,533 @@
 \(lqelf64\(rq
 object format selects the
 \(lqamd64\(rq
-machine architecture by default.
+machine architecture by default\&.
 .SH "X86 ARCHITECTURE"
 .PP
 The
 \(lqx86\(rq
-architecture supports the IA\-32 instruction set and derivatives and the AMD64 instruction set. It consists of two machines:
+architecture supports the IA\-32 instruction set and derivatives and the AMD64 instruction set\&. It consists of two machines:
 \(lqx86\(rq
 (for the IA\-32 and derivatives) and
 \(lqamd64\(rq
-(for the AMD64 and derivatives). The default machine for the
+(for the AMD64 and derivatives)\&. The default machine for the
 \(lqx86\(rq
 architecture is the
 \(lqx86\(rq
-machine.
+machine\&.
 .SS "BITS Setting"
 .PP
-The x86 architecture BITS setting specifies to Yasm the processor mode in which the generated code is intended to execute. x86 processors can run in three different major execution modes: 16\-bit, 32\-bit, and on AMD64\-supporting processors, 64\-bit. As the x86 instruction set contains portions whose function is execution\-mode dependent (such as operand\-size and address\-size override prefixes), Yasm cannot assemble x86 instructions correctly unless it is told by the user in what processor mode the code will execute.
+The x86 architecture BITS setting specifies to Yasm the processor mode in which the generated code is intended to execute\&. x86 processors can run in three different major execution modes: 16\-bit, 32\-bit, and on AMD64\-supporting processors, 64\-bit\&. As the x86 instruction set contains portions whose function is execution\-mode dependent (such as operand\-size and address\-size override prefixes), Yasm cannot assemble x86 instructions correctly unless it is told by the user in what processor mode the code will execute\&.
 .PP
-The BITS setting can be changed in a variety of ways. When using the NASM\-compatible parser, the BITS setting can be changed directly via the use of the
+The BITS setting can be changed in a variety of ways\&. When using the NASM\-compatible parser, the BITS setting can be changed directly via the use of the
 \fBBITS xx\fR
-assembler directive. The default BITS setting is determined by the object format in use.
+assembler directive\&. The default BITS setting is determined by the object format in use\&.
 .SS "BITS 64 Extensions"
 .PP
-The AMD64 architecture is a new 64\-bit architecture developed by AMD, based on the 32\-bit x86 architecture. It extends the original x86 architecture by doubling the number of general purpose and SIMD registers, extending the arithmetic operations and address space to 64 bits, as well as other features.
+The AMD64 architecture is a new 64\-bit architecture developed by AMD, based on the 32\-bit x86 architecture\&. It extends the original x86 architecture by doubling the number of general purpose and SIMD registers, extending the arithmetic operations and address space to 64 bits, as well as other features\&.
 .PP
-Recently, Intel has introduced an essentially identical version of AMD64 called EM64T.
+Recently, Intel has introduced an essentially identical version of AMD64 called EM64T\&.
 .PP
-When an AMD64\-supporting processor is executing in 64\-bit mode, a number of additional extensions are available, including extra general purpose registers, extra SSE2 registers, and RIP\-relative addressing.
+When an AMD64\-supporting processor is executing in 64\-bit mode, a number of additional extensions are available, including extra general purpose registers, extra SSE2 registers, and RIP\-relative addressing\&.
 .PP
-Yasm extends the base NASM syntax to support AMD64 as follows. To enable assembly of instructions for the 64\-bit mode of AMD64 processors, use the directive
-\fBBITS 64\fR. As with NASM's BITS directive, this does not change the format of the output object file to 64 bits; it only changes the assembler mode to assume that the instructions being assembled will be run in 64\-bit mode. To specify an AMD64 object file, use
+Yasm extends the base NASM syntax to support AMD64 as follows\&. To enable assembly of instructions for the 64\-bit mode of AMD64 processors, use the directive
+\fBBITS 64\fR\&. As with NASM\'s BITS directive, this does not change the format of the output object file to 64 bits; it only changes the assembler mode to assume that the instructions being assembled will be run in 64\-bit mode\&. To specify an AMD64 object file, use
 \fB\-m amd64\fR
 on the Yasm command line, or explicitly target a 64\-bit object format such as
 \fB\-f win64\fR
 or
-\fB\-f elf64\fR.
+\fB\-f elf64\fR\&.
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
+.ps +1
 \fBRegister Changes\fR
-.RS
+.RS 4
 .PP
-The additional 64\-bit general purpose registers are named r8\-r15. There are also 8\-bit (rXb), 16\-bit (rXw), and 32\-bit (rXd) subregisters that map to the least significant 8, 16, or 32 bits of the 64\-bit register. The original 8 general purpose registers have also been extended to 64\-bits: eax, edx, ecx, ebx, esi, edi, esp, and ebp have new 64\-bit versions called rax, rdx, rcx, rbx, rsi, rdi, rsp, and rbp respectively. The old 32\-bit registers map to the least significant bits of the new 64\-bit registers.
+The additional 64\-bit general purpose registers are named r8\-r15\&. There are also 8\-bit (rXb), 16\-bit (rXw), and 32\-bit (rXd) subregisters that map to the least significant 8, 16, or 32 bits of the 64\-bit register\&. The original 8 general purpose registers have also been extended to 64\-bits: eax, edx, ecx, ebx, esi, edi, esp, and ebp have new 64\-bit versions called rax, rdx, rcx, rbx, rsi, rdi, rsp, and rbp respectively\&. The old 32\-bit registers map to the least significant bits of the new 64\-bit registers\&.
 .PP
-New 8\-bit registers are also available that map to the 8 least significant bits of rsi, rdi, rsp, and rbp. These are called sil, dil, spl, and bpl respectively. Unfortunately, due to the way instructions are encoded, these new 8\-bit registers are encoded the same as the old 8\-bit registers ah, dh, ch, and bh. The processor tells which is being used by the presence of the new REX prefix that is used to specify the other extended registers. This means it is illegal to mix the use of ah, dh, ch, and bh with an instruction that requires the REX prefix for other reasons. For instance:
+New 8\-bit registers are also available that map to the 8 least significant bits of rsi, rdi, rsp, and rbp\&. These are called sil, dil, spl, and bpl respectively\&. Unfortunately, due to the way instructions are encoded, these new 8\-bit registers are encoded the same as the old 8\-bit registers ah, dh, ch, and bh\&. The processor tells which is being used by the presence of the new REX prefix that is used to specify the other extended registers\&. This means it is illegal to mix the use of ah, dh, ch, and bh with an instruction that requires the REX prefix for other reasons\&. For instance:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 add ah, [r10]
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-(NASM syntax) is not a legal instruction because the use of r10 requires a REX prefix, making it impossible to use ah.
+(NASM syntax) is not a legal instruction because the use of r10 requires a REX prefix, making it impossible to use ah\&.
 .PP
-In 64\-bit mode, an additional 8 SSE2 registers are also available. These are named xmm8\-xmm15.
+In 64\-bit mode, an additional 8 SSE2 registers are also available\&. These are named xmm8\-xmm15\&.
 .RE
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
+.ps +1
 \fB64 Bit Instructions\fR
-.RS
+.RS 4
 .PP
-By default, most operations in 64\-bit mode remain 32\-bit; operations that are 64\-bit usually require a REX prefix (one bit in the REX prefix determines whether an operation is 64\-bit or 32\-bit). Thus, essentially all 32\-bit instructions have a 64\-bit version, and the 64\-bit versions of instructions can use extended registers
+By default, most operations in 64\-bit mode remain 32\-bit; operations that are 64\-bit usually require a REX prefix (one bit in the REX prefix determines whether an operation is 64\-bit or 32\-bit)\&. Thus, essentially all 32\-bit instructions have a 64\-bit version, and the 64\-bit versions of instructions can use extended registers
 \(lqfor free\(rq
-(as the REX prefix is already present). Examples in NASM syntax:
+(as the REX prefix is already present)\&. Examples in NASM syntax:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov eax, 1  ; 32\-bit instruction
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 mov rcx, 1  ; 64\-bit instruction
 .fi
+.if n \{\
 .RE
+.\}
 .PP
-Instructions that modify the stack (push, pop, call, ret, enter, and leave) are implicitly 64\-bit. Their 32\-bit counterparts are not available, but their 16\-bit counterparts are. Examples in NASM syntax:
+Instructions that modify the stack (push, pop, call, ret, enter, and leave) are implicitly 64\-bit\&. Their 32\-bit counterparts are not available, but their 16\-bit counterparts are\&. Examples in NASM syntax:
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 push eax  ; illegal instruction
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 push rbx  ; 1\-byte instruction
 .fi
+.if n \{\
 .RE
+.\}
 .sp
+.if n \{\
 .RS 4
+.\}
 .nf
 push r11  ; 2\-byte instruction with REX prefix
 .fi
+.if n \{\
 .RE

yasm-1.1.0.tar.gz/yasm_dbgfmts.7 -> yasm-1.2.0.tar.gz/yasm_dbgfmts.7 Changed

@@ -1,53 +1,63 @@
+'\" t
 .\"     Title: yasm_dbgfmts
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: October 2006
 .\"    Manual: Yasm Supported Debug Formats
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM_DBGFMTS" "7" "October 2006" "Yasm" "Yasm Supported Debug Formats"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm_dbgfmts \- Yasm Supported Debugging Formats
 .SH "SYNOPSIS"
-.HP 5
-\fByasm\fR \fB\-g\ \fR\fB\fIdbgfmt\fR\fR \fB\fI...\fR\fR
+.HP \w'\fByasm\fR\ 'u
+\fByasm\fR \fB\-g\ \fR\fB\fIdbgfmt\fR\fR \fB\fI\&.\&.\&.\fR\fR
 .SH "DESCRIPTION"
 .PP
-The standard Yasm distribution includes a number of modules for different debugging formats. The debugging information is embedded into the object file. Use of a non\-\(lqnull\(rq
-debug format also causes Yasm to output all symbols to the object file (including local symbols).
+The standard Yasm distribution includes a number of modules for different debugging formats\&. The debugging information is embedded into the object file\&. Use of a non\-\(lqnull\(rq
+debug format also causes Yasm to output all symbols to the object file (including local symbols)\&.
 .PP
 The debug format is selected on the
 \fByasm\fR(1)
 command line by use of the
 \fB\-g \fR\fB\fIdbgfmt\fR\fR
-command line option.
+command line option\&.
 .SH "CV8"
 .PP
-The CV8 debug format is used by Microsoft Visual Studio 2005 (version 8.0) and is completely undocumented, although it bears strong similarities to earlier CodeView formats. Yasm's support for the CV8 debug format is currently limited to generating assembly\-level line number information (to allow some level of source\-level debugging). The CV8 debug information is stored in the .debug$S and .debug$T sections of the Win64 object file.
+The CV8 debug format is used by Microsoft Visual Studio 2005 (version 8\&.0) and is completely undocumented, although it bears strong similarities to earlier CodeView formats\&. Yasm\'s support for the CV8 debug format is currently limited to generating assembly\-level line number information (to allow some level of source\-level debugging)\&. The CV8 debug information is stored in the \&.debug$S and \&.debug$T sections of the Win64 object file\&.
 .SH "DWARF2"
 .PP
-The DWARF 2 debug format is a complex, well\-documented standard for debugging information. It was created to overcome shortcomings in STABS, allowing for much more detailed and compact descriptions of data structures, data variable movement, and complex language structures such as in C++. The debugging information is stored in sections (just like normal program sections) in the object file. Yasm supports full pass\-through of DWARF2 debugging information (e.g. from a C++ compiler), and can also generate assembly\-level line number information.
+The DWARF 2 debug format is a complex, well\-documented standard for debugging information\&. It was created to overcome shortcomings in STABS, allowing for much more detailed and compact descriptions of data structures, data variable movement, and complex language structures such as in C++\&. The debugging information is stored in sections (just like normal program sections) in the object file\&. Yasm supports full pass\-through of DWARF2 debugging information (e\&.g\&. from a C++ compiler), and can also generate assembly\-level line number information\&.
 .SH "NULL"
 .PP
 The
 \(lqnull\(rq
-debug format is a placeholder; it adds no debugging information to the output file.
+debug format is a placeholder; it adds no debugging information to the output file\&.
 .SH "STABS"
 .PP
-The STABS debug format is a poorly documented, semi\-standard format for debugging information in COFF and ELF object files. The debugging information is stored as part of the object file's symbol table and thus is limited in complexity and scope. Despite this, STABS is a common debugging format on older Unix and compatible systems, as well as DJGPP.
+The STABS debug format is a poorly documented, semi\-standard format for debugging information in COFF and ELF object files\&. The debugging information is stored as part of the object file\'s symbol table and thus is limited in complexity and scope\&. Despite this, STABS is a common debugging format on older Unix and compatible systems, as well as DJGPP\&.
 .SH "SEE ALSO"
 .PP
 \fByasm\fR(1),
 \fByasm_objfmts\fR(7)
 .SH "AUTHOR"
 .PP
-\fBPeter\fR \fBJohnson\fR <peter@tortall.net>
-.sp -1n
-.IP "" 3n
+\fBPeter Johnson\fR <\&peter@tortall\&.net\&>
+.RS 4
 Author.
+.RE
 .SH "COPYRIGHT"
+.br
 Copyright \(co 2006 Peter Johnson
+.br

yasm-1.1.0.tar.gz/yasm_objfmts.7 -> yasm-1.2.0.tar.gz/yasm_objfmts.7 Changed

@@ -1,81 +1,91 @@
+'\" t
 .\"     Title: yasm_objfmts
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: February 2007
 .\"    Manual: Yasm Supported Object Formats
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM_OBJFMTS" "7" "February 2007" "Yasm" "Yasm Supported Object Formats"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm_objfmts \- Yasm Supported Object Formats
 .SH "SYNOPSIS"
-.HP 5
-\fByasm\fR \fB\-f\ \fR\fB\fIobjfmt\fR\fR \fB\fI...\fR\fR
+.HP \w'\fByasm\fR\ 'u
+\fByasm\fR \fB\-f\ \fR\fB\fIobjfmt\fR\fR \fB\fI\&.\&.\&.\fR\fR
 .SH "DESCRIPTION"
 .PP
-The standard Yasm distribution includes a number of modules for different object formats (Yasm's primary output).
+The standard Yasm distribution includes a number of modules for different object formats (Yasm\'s primary output)\&.
 .PP
 The object format is selected on the
 \fByasm\fR(1)
 command line by use of the
 \fB\-f \fR\fB\fIobjfmt\fR\fR
-command line option.
+command line option\&.
 .SH "BIN"
 .PP
 The
 \(lqbin\(rq
-object format produces a flat\-format, non\-relocatable binary file. It is appropriate for producing DOS .COM executables or things like boot blocks. It supports only 3 sections and those sections are written in a predefined order to the output file.
+object format produces a flat\-format, non\-relocatable binary file\&. It is appropriate for producing DOS \&.COM executables or things like boot blocks\&. It supports only 3 sections and those sections are written in a predefined order to the output file\&.
 .SH "COFF"
 .PP
-The COFF object format is an older relocatable object format used on older Unix and compatible systems, and also (more recently) on the DJGPP development system for DOS.
+The COFF object format is an older relocatable object format used on older Unix and compatible systems, and also (more recently) on the DJGPP development system for DOS\&.
 .SH "DBG"
 .PP
 The
 \(lqdbg\(rq
 object format is not a
 \(lqreal\(rq
-object format; the output file it creates simply describes the sequence of calls made to it by Yasm and the final object and symbol table information in a human\-readable text format (that in a normal object format would get processed into that object format's particular binary representation). This object format is not intended for real use, but rather for debugging Yasm's internals.
+object format; the output file it creates simply describes the sequence of calls made to it by Yasm and the final object and symbol table information in a human\-readable text format (that in a normal object format would get processed into that object format\'s particular binary representation)\&. This object format is not intended for real use, but rather for debugging Yasm\'s internals\&.
 .SH "ELF"
 .PP
 The ELF object format really comes in two flavors:
 \(lqelf32\(rq
 (for 32\-bit targets) and
 \(lqelf64\(rq
-(for 64\-bit targets). ELF is a standard object format in common use on modern Unix and compatible systems (e.g. Linux, FreeBSD). ELF has complex support for relocatable and shared objects.
+(for 64\-bit targets)\&. ELF is a standard object format in common use on modern Unix and compatible systems (e\&.g\&. Linux, FreeBSD)\&. ELF has complex support for relocatable and shared objects\&.
 .SH "MACHO"
 .PP
 The Mach\-O object format really comes in two flavors:
 \(lqmacho32\(rq
 (for 32\-bit targets) and
 \(lqmacho64\(rq
-(for 64\-bit targets). Mach\-O is used as the object format on MacOS X. As Yasm currently only supports x86 and AMD64 instruction sets, it can only generate Mach\-O objects for Intel\-based Macs.
+(for 64\-bit targets)\&. Mach\-O is used as the object format on MacOS X\&. As Yasm currently only supports x86 and AMD64 instruction sets, it can only generate Mach\-O objects for Intel\-based Macs\&.
 .SH "RDF"
 .PP
-The RDOFF2 object format is a simple multi\-section format originally designed for NASM. It supports segment references but not WRT references. It was designed primarily for simplicity and has minimalistic headers for ease of loading and linking. A complete toolchain (linker, librarian, and loader) is distributed with NASM.
+The RDOFF2 object format is a simple multi\-section format originally designed for NASM\&. It supports segment references but not WRT references\&. It was designed primarily for simplicity and has minimalistic headers for ease of loading and linking\&. A complete toolchain (linker, librarian, and loader) is distributed with NASM\&.
 .SH "WIN32"
 .PP
-The Win32 object format produces object files compatible with Microsoft compilers (such as Visual C++) that target the 32\-bit x86 Windows platform. The object format itself is an extended version of COFF.
+The Win32 object format produces object files compatible with Microsoft compilers (such as Visual C++) that target the 32\-bit x86 Windows platform\&. The object format itself is an extended version of COFF\&.
 .SH "WIN64"
 .PP
 The Win64 object format produces object files compatible with Microsoft compilers that target the 64\-bit
 \(lqx64\(rq
-Windows platform. This format is very similar to the win32 object format, but produces 64\-bit objects.
+Windows platform\&. This format is very similar to the win32 object format, but produces 64\-bit objects\&.
 .SH "XDF"
 .PP
-The XDF object format is essentially a simplified version of COFF. It's a multi\-section relocatable format that supports 64\-bit physical and virtual addresses.
+The XDF object format is essentially a simplified version of COFF\&. It\'s a multi\-section relocatable format that supports 64\-bit physical and virtual addresses\&.
 .SH "SEE ALSO"
 .PP
 \fByasm\fR(1),
 \fByasm_arch\fR(7)
 .SH "AUTHOR"
 .PP
-\fBPeter\fR \fBJohnson\fR <peter@tortall.net>
-.sp -1n
-.IP "" 3n
+\fBPeter Johnson\fR <\&peter@tortall\&.net\&>
+.RS 4
 Author.
+.RE
 .SH "COPYRIGHT"
+.br
 Copyright \(co 2006 Peter Johnson
+.br

yasm-1.1.0.tar.gz/yasm_parsers.7 -> yasm-1.2.0.tar.gz/yasm_parsers.7 Changed

@@ -1,48 +1,58 @@
+'\" t
 .\"     Title: yasm_parsers
 .\"    Author: Peter Johnson <peter@tortall.net>
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: October 2006
 .\"    Manual: Yasm Supported Parsers
 .\"    Source: Yasm
+.\"  Language: English
 .\"
 .TH "YASM_PARSERS" "7" "October 2006" "Yasm" "Yasm Supported Parsers"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 yasm_parsers \- Yasm Supported Parsers (Assembler Syntaxes)
 .SH "SYNOPSIS"
-.HP 5
-\fByasm\fR \fB\-p\ \fR\fB\fIparser\fR\fR [\fB\-r\ \fR\fB\fIpreproc\fR\fR] \fB\fI...\fR\fR
+.HP \w'\fByasm\fR\ 'u
+\fByasm\fR \fB\-p\ \fR\fB\fIparser\fR\fR [\fB\-r\ \fR\fB\fIpreproc\fR\fR] \fB\fI\&.\&.\&.\fR\fR
 .SH "DESCRIPTION"
 .PP
-The standard Yasm distribution includes a number of modules for different parsers (assembler syntaxes).
+The standard Yasm distribution includes a number of modules for different parsers (assembler syntaxes)\&.
 .PP
 The parser is selected on the
 \fByasm\fR(1)
 command line by use of the
 \fB\-p \fR\fB\fIparser\fR\fR
-command line option.
+command line option\&.
 .SH "NASM PARSER"
 .PP
 NASM syntax, selected with
-\fB\-p nasm\fR, is the most full\-featured syntax supported by Yasm. Yasm is nearly 100% compatible with NASM for 16\-bit and 32\-bit x86 code. Yasm additionally supports 64\-bit AMD64 code with Yasm extensions to the NASM syntax; see
+\fB\-p nasm\fR, is the most full\-featured syntax supported by Yasm\&. Yasm is nearly 100% compatible with NASM for 16\-bit and 32\-bit x86 code\&. Yasm additionally supports 64\-bit AMD64 code with Yasm extensions to the NASM syntax; see
 \fByasm_arch\fR(7)
-for details. NASM syntax is the Yasm default.
+for details\&. NASM syntax is the Yasm default\&.
 .SH "GAS PARSER"
 .PP
-The GNU Assembler (GAS) is the de\-facto cross\-platform assembler for modern Unix systems, and is used as the backend for the GCC compiler. Yasm's support for GAS syntax is moderately good, although immature: not all directives are supported, and only 32\-bit x86 and AMD64 architectures are supported. There is also no support for the GAS preprocessor. Despite these limitations, Yasm's GAS syntax support is good enough to handle essentially all x86 and AMD64 GCC compiler output. The GAS parser can be selected with
-\fB\-p gas\fR.
+The GNU Assembler (GAS) is the de\-facto cross\-platform assembler for modern Unix systems, and is used as the backend for the GCC compiler\&. Yasm\'s support for GAS syntax is moderately good, although immature: not all directives are supported, and only 32\-bit x86 and AMD64 architectures are supported\&. Nearly all of the GAS preprocessor is also supported\&. Yasm\'s GAS syntax support is good enough to handle essentially all x86 and AMD64 GCC compiler output\&. The GAS parser can be selected with
+\fB\-p gas\fR\&.
 .SH "SEE ALSO"
 .PP
 \fByasm\fR(1),
 \fByasm_arch\fR(7)
 .SH "AUTHOR"
 .PP
-\fBPeter\fR \fBJohnson\fR <peter@tortall.net>
-.sp -1n
-.IP "" 3n
+\fBPeter Johnson\fR <\&peter@tortall\&.net\&>
+.RS 4
 Author.
+.RE
 .SH "COPYRIGHT"
+.br
 Copyright \(co 2006 Peter Johnson
+.br

Changes of Revision 8