diff -Nru orc-0.4.17/aclocal.m4 orc-0.4.18/aclocal.m4 --- orc-0.4.17/aclocal.m4 2013-02-20 05:38:16.000000000 +0000 +++ orc-0.4.18/aclocal.m4 2013-08-24 17:18:14.000000000 +0000 @@ -438,18 +438,6 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# 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 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, diff -Nru orc-0.4.17/configure orc-0.4.18/configure --- orc-0.4.17/configure 2013-02-20 05:38:16.000000000 +0000 +++ orc-0.4.18/configure 2013-08-24 17:18:14.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for orc 0.4.17. +# Generated by GNU Autoconf 2.69 for orc 0.4.18. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='orc' PACKAGE_TARNAME='orc' -PACKAGE_VERSION='0.4.17' -PACKAGE_STRING='orc 0.4.17' +PACKAGE_VERSION='0.4.18' +PACKAGE_STRING='orc 0.4.18' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1374,7 +1374,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures orc 0.4.17 to adapt to many kinds of systems. +\`configure' configures orc 0.4.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1444,7 +1444,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of orc 0.4.17:";; + short | recursive ) echo "Configuration of orc 0.4.18:";; esac cat <<\_ACEOF @@ -1553,7 +1553,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -orc configure 0.4.17 +orc configure 0.4.18 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1918,7 +1918,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by orc $as_me 0.4.17, which was +It was created by orc $as_me 0.4.18, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2274,7 +2274,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 0.4.17 | sed 's/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.*//') + NANO=$(echo 0.4.18 | sed 's/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.*//') if test x"$NANO" = x || test "x$NANO" = "x0" ; then @@ -2827,7 +2827,7 @@ # Define the identity of the package. PACKAGE='orc' - VERSION='0.4.17' + VERSION='0.4.18' cat >>confdefs.h <<_ACEOF @@ -2874,7 +2874,7 @@ ac_config_headers="$ac_config_headers config.h" -ORC_LIBVERSION="17:0:17" +ORC_LIBVERSION="18:0:18" enable_win32_dll=yes @@ -13253,6 +13253,13 @@ $as_echo "#define HAVE_THREAD_WIN32 1" >>confdefs.h ;; + *android*) + +$as_echo "#define HAVE_THREAD_PTHREAD 1" >>confdefs.h + + PTHREAD_CFLAGS= + PTHREAD_LIBS= + ;; *) $as_echo "#define HAVE_THREAD_PTHREAD 1" >>confdefs.h @@ -14026,7 +14033,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by orc $as_me 0.4.17, which was +This file was extended by orc $as_me 0.4.18, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14092,7 +14099,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -orc config.status 0.4.17 +orc config.status 0.4.18 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru orc-0.4.17/configure.ac orc-0.4.18/configure.ac --- orc-0.4.17/configure.ac 2013-02-20 05:38:04.000000000 +0000 +++ orc-0.4.18/configure.ac 2013-08-24 17:16:03.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.58]) -AC_INIT(orc,0.4.17) +AC_INIT(orc,0.4.18) dnl don't forget to update libversion AS_NANO(ORC_GIT=no,ORC_GIT=yes) @@ -10,14 +10,14 @@ ORC_MAJORMINOR=0.4 AC_SUBST(ORC_MAJORMINOR) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADER(config.h) dnl CURRENT, REVISION, AGE dnl - library source changed -> increment REVISION dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 -ORC_LIBVERSION="17:0:17" +ORC_LIBVERSION="18:0:18" AC_SUBST(ORC_LIBVERSION) AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_TAGS([]) @@ -109,6 +109,11 @@ mingw*|pw32*|cygwin*) AC_DEFINE(HAVE_THREAD_WIN32, 1, [Use Windows thread code]) ;; + *android*) + AC_DEFINE(HAVE_THREAD_PTHREAD, 1, [Use pthread thread code]) + PTHREAD_CFLAGS= + PTHREAD_LIBS= + ;; *) AC_DEFINE(HAVE_THREAD_PTHREAD, 1, [Use pthread thread code]) PTHREAD_CFLAGS= diff -Nru orc-0.4.17/debian/changelog orc-0.4.18/debian/changelog --- orc-0.4.17/debian/changelog 2013-05-06 06:35:24.000000000 +0000 +++ orc-0.4.18/debian/changelog 2013-08-26 07:04:26.000000000 +0000 @@ -1,3 +1,9 @@ +orc (1:0.4.18-1) unstable; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Mon, 26 Aug 2013 09:04:15 +0200 + orc (1:0.4.17-2) unstable; urgency=low * Upload to unstable. diff -Nru orc-0.4.17/debian/rules orc-0.4.18/debian/rules --- orc-0.4.17/debian/rules 2013-02-20 09:43:34.000000000 +0000 +++ orc-0.4.18/debian/rules 2013-08-26 07:05:11.000000000 +0000 @@ -7,7 +7,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=liborc-0.4-0-dbg DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) APIVER := 0.4 -SHLIBVER := 1:0.4.17 +SHLIBVER := 1:0.4.18 liborc := $(shell sed -nr 's/^Package:[[:space:]]*(liborc-$(APIVER)-[0-9]+)[[:space:]]*$$/\1/p' debian/control) DEB_DH_MAKESHLIBS_ARGS_$(liborc) = -V '$(liborc) (>= $(SHLIBVER))' diff -Nru orc-0.4.17/doc/Makefile.am orc-0.4.18/doc/Makefile.am --- orc-0.4.17/doc/Makefile.am 2011-05-18 20:04:12.000000000 +0000 +++ orc-0.4.18/doc/Makefile.am 2013-08-02 20:49:16.000000000 +0000 @@ -66,7 +66,8 @@ # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). # e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files=building.xml concepts.xml opcode_table.xml opcodes.xml running.xml tutorial.xml table.xml +content_files=building.xml concepts.xml opcode_table.xml opcodes.xml \ + program.xml running.xml tutorial.xml table.xml # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded # These files must be listed here *and* in content_files @@ -104,3 +105,7 @@ update-www: rsync -a html/* cooker.entropywave.com:/srv/code.entropywave.com/www/documentation/orc +update-tables: $(top_builddir)/testsuite/generate_xml_table $(top_builddir)/testsuite/generate_xml_table2 + $(top_builddir)/testsuite/generate_xml_table >table.xml + $(top_builddir)/testsuite/generate_xml_table2 >opcode_table.xml + diff -Nru orc-0.4.17/doc/Makefile.in orc-0.4.18/doc/Makefile.in --- orc-0.4.17/doc/Makefile.in 2013-02-20 05:38:18.000000000 +0000 +++ orc-0.4.18/doc/Makefile.in 2013-08-24 17:18:15.000000000 +0000 @@ -282,7 +282,9 @@ # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). # e.g. content_files=running.sgml building.sgml changes-2.0.sgml -content_files = building.xml concepts.xml opcode_table.xml opcodes.xml running.xml tutorial.xml table.xml +content_files = building.xml concepts.xml opcode_table.xml opcodes.xml \ + program.xml running.xml tutorial.xml table.xml + # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded # These files must be listed here *and* in content_files @@ -712,6 +714,10 @@ update-www: rsync -a html/* cooker.entropywave.com:/srv/code.entropywave.com/www/documentation/orc +update-tables: $(top_builddir)/testsuite/generate_xml_table $(top_builddir)/testsuite/generate_xml_table2 + $(top_builddir)/testsuite/generate_xml_table >table.xml + $(top_builddir)/testsuite/generate_xml_table2 >opcode_table.xml + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru orc-0.4.17/doc/html/ch01.html orc-0.4.18/doc/html/ch01.html --- orc-0.4.17/doc/html/ch01.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/ch01.html 2013-08-24 17:18:52.000000000 +0000 @@ -21,7 +21,7 @@

-Overview

+Overview
Building Orc and Applications That Use Orc — diff -Nru orc-0.4.17/doc/html/ch02.html orc-0.4.18/doc/html/ch02.html --- orc-0.4.17/doc/html/ch02.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/ch02.html 2013-08-24 17:18:52.000000000 +0000 @@ -21,7 +21,7 @@

-Application API

+Application API
Orc — Library Initialization @@ -36,6 +36,11 @@ OrcExecutor — Running Orc programs
+Orc Program Syntax — +Description of the Orc program syntax + +
+
Orc Opcodes — Description of Opcodes diff -Nru orc-0.4.17/doc/html/ch03.html orc-0.4.18/doc/html/ch03.html --- orc-0.4.17/doc/html/ch03.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/ch03.html 2013-08-24 17:18:52.000000000 +0000 @@ -21,7 +21,7 @@

-Extension API

+Extension API
OrcDebug — Printing and formatting debug information diff -Nru orc-0.4.17/doc/html/ch04.html orc-0.4.18/doc/html/ch04.html --- orc-0.4.17/doc/html/ch04.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/ch04.html 2013-08-24 17:18:52.000000000 +0000 @@ -21,7 +21,7 @@

-Code Generation

+Code Generation
ARM — code generation for ARM diff -Nru orc-0.4.17/doc/html/ch05.html orc-0.4.18/doc/html/ch05.html --- orc-0.4.17/doc/html/ch05.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/ch05.html 2013-08-24 17:18:52.000000000 +0000 @@ -21,7 +21,7 @@

-Herein lie dragons

+Herein lie dragons
misc
diff -Nru orc-0.4.17/doc/html/index.html orc-0.4.18/doc/html/index.html --- orc-0.4.17/doc/html/index.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/index.html 2013-08-24 17:18:52.000000000 +0000 @@ -15,7 +15,7 @@

- for Orc-0.4.17. + for Orc-0.4.18. The latest version of this documentation can be found on-line at http://code.entropywave.com/documentation/orc/.

@@ -61,6 +61,11 @@ OrcExecutor — Running Orc programs
+Orc Program Syntax — +Description of the Orc program syntax + +
+
Orc Opcodes — Description of Opcodes diff -Nru orc-0.4.17/doc/html/index.sgml orc-0.4.18/doc/html/index.sgml --- orc-0.4.17/doc/html/index.sgml 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/index.sgml 2013-08-24 17:18:52.000000000 +0000 @@ -73,6 +73,7 @@ + diff -Nru orc-0.4.17/doc/html/orc-OrcExecutor.html orc-0.4.18/doc/html/orc-OrcExecutor.html --- orc-0.4.17/doc/html/orc-OrcExecutor.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/orc-OrcExecutor.html 2013-08-24 17:18:52.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ Up Home Orc Reference Manual -Next +Next Top diff -Nru orc-0.4.17/doc/html/orc-building.html orc-0.4.18/doc/html/orc-building.html --- orc-0.4.17/doc/html/orc-building.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/orc-building.html 2013-08-24 17:18:52.000000000 +0000 @@ -31,7 +31,7 @@
-

Building Orc on UNIX

+

Building Orc on UNIX

On UNIX, Orc uses the standard GNU build system, using autoconf for package @@ -67,7 +67,7 @@

-

Building Orc Applications

+

Building Orc Applications

Applications and libraries can use pkg-config to get all the needed compiler and linker flags to build against Orc. The following diff -Nru orc-0.4.17/doc/html/orc-concepts.html orc-0.4.18/doc/html/orc-concepts.html --- orc-0.4.17/doc/html/orc-concepts.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/orc-concepts.html 2013-08-24 17:18:52.000000000 +0000 @@ -31,7 +31,7 @@

-

Orc Concepts

+

Orc Concepts

Orc is a compiler for a simple assembly-like language. Unlike most compilers, Orc is primarily a library, which means that @@ -97,7 +97,7 @@

-

Concepts

+

Concepts

The OrcProgram is the primary object that applications use when using Orc to create code. It contains all the information related to @@ -210,7 +210,7 @@

-

Extending Orc

+

Extending Orc

Developers can extend Orc primarily by adding new opcode sets, adding new targets, and by adding new target rules. diff -Nru orc-0.4.17/doc/html/orc-opcodes.html orc-0.4.18/doc/html/orc-opcodes.html --- orc-0.4.17/doc/html/orc-opcodes.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/orc-opcodes.html 2013-08-24 17:18:52.000000000 +0000 @@ -6,14 +6,14 @@ - + - + @@ -31,7 +31,7 @@

-

Orc Opcodes

+

Orc Opcodes

Opcodes only work with variables of a particular size. In the table below, destination and source indicate the size of the @@ -1658,7 +1658,7 @@

-

Rule Coverage

+

Rule Coverage

The values for shift operations are not correct in this table.

diff -Nru orc-0.4.17/doc/html/orc-program.html orc-0.4.18/doc/html/orc-program.html --- orc-0.4.17/doc/html/orc-program.html 1970-01-01 00:00:00.000000000 +0000 +++ orc-0.4.18/doc/html/orc-program.html 2013-08-24 17:18:52.000000000 +0000 @@ -0,0 +1,137 @@ + + + + +Orc Program Syntax + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Orc Program Syntax

+

Orc Program — +Description of the Orc program syntax +

+
+
+

Orc Program

+

+ An orc program is an UTF-8 file containing the source read by the + Orc-compiler. Each program consists of several blocks. Each block contains a + directives and opcodes. +

+
+

.init

+

+ Global initialisation for a module. +

+
+
+
+

.function

+
+.function <function-name>
+

+ Starts a new function. Takes one arg which is the function name. +

+
+
+
+

.flags

+
+.flags (1d|2d)
+

+ Tells wheter arrays are 1 or 2 dimensional. The default is 1d. +

+
+
+
+

.source

+
+.source <size> <var-name> [<type-name>]
+

+ Input data array parameter for functions. Arguments denote size of the items + in the array (1,2,4,8), name of the variable and optional name of the type. + Only reads are allowed. + +

+
+
+
+

.dest

+
+.dest <size> <var-name> [<type-name>]
+

+ Output data array parameter for functions. Arguments denote size of the + items in the array (1,2,4,8), name of the variable and optional name of the + type. This directive can also be used for in/out array parameters. + +

+
+
+
+

.accumulator

+
+.accumulator <size> <var-name> [<type-name>]
+

+ Output value parameter for functions. Arguments denote size of the variable + (1,2,4,8), name of the variable and optional name of the type. +

+
+
+
+

.param

+
+.param <size> <var-name> [<type-name>]
+

+ Parameter for functions. Arguments denote size of the variable (1,2,4,8), + name of the variable and optional name of the type. +

+

+ This directive has variants named: .longparam, .floatparam and .doubleparam. +

+
+
+
+

.const

+
+.const <size> <var-name>
+

+ Constant for functions. Arguments denote size of the constant (1,2,4,8) and + the name. +

+
+
+
+

.temp

+
+.temp <size> <var-name>
+

+ Local variable for functions. Arguments denote size of the variable + (1,2,4,8) and then name. +

+
+
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff -Nru orc-0.4.17/doc/html/orc-runninging.html orc-0.4.18/doc/html/orc-runninging.html --- orc-0.4.17/doc/html/orc-runninging.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/orc-runninging.html 2013-08-24 17:18:52.000000000 +0000 @@ -31,7 +31,7 @@
-

Running Orc Applications

+

Running Orc Applications

At runtime several environment variables can be used to control ORC.

diff -Nru orc-0.4.17/doc/html/orc-tutorial.html orc-0.4.18/doc/html/orc-tutorial.html --- orc-0.4.17/doc/html/orc-tutorial.html 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/orc-tutorial.html 2013-08-24 17:18:52.000000000 +0000 @@ -31,7 +31,7 @@
-

Orc Tutorial

+

Orc Tutorial

This section walks you through several examples of increasing complexity to get you started working with Orc. Each of these @@ -56,7 +56,7 @@

-

Example 1

+

Example 1

This example demonstrates combining two stereo audio streams by adding. Uncompressed audio streams (i.e., PCM format) can @@ -294,7 +294,7 @@

-

Example 2

+

Example 2

In this example, we will expand on the previous example by making one of the input arrays a mono stream, and also scale the mono @@ -415,7 +415,7 @@

-

Example 3

+

Example 3

The third example shows how to convert a planar 4:2:0 video image into a packed 4:4:4 video image with an alpha channel. The diff -Nru orc-0.4.17/doc/html/orc.devhelp2 orc-0.4.18/doc/html/orc.devhelp2 --- orc-0.4.17/doc/html/orc.devhelp2 2013-02-20 06:24:54.000000000 +0000 +++ orc-0.4.18/doc/html/orc.devhelp2 2013-08-24 17:18:52.000000000 +0000 @@ -13,6 +13,7 @@ + @@ -87,6 +88,15 @@ + + + + + + + + + diff -Nru orc-0.4.17/doc/orc-docs.sgml orc-0.4.18/doc/orc-docs.sgml --- orc-0.4.17/doc/orc-docs.sgml 2011-05-18 20:04:12.000000000 +0000 +++ orc-0.4.18/doc/orc-docs.sgml 2013-08-02 20:49:16.000000000 +0000 @@ -28,6 +28,7 @@ + diff -Nru orc-0.4.17/doc/program.xml orc-0.4.18/doc/program.xml --- orc-0.4.17/doc/program.xml 1970-01-01 00:00:00.000000000 +0000 +++ orc-0.4.18/doc/program.xml 2013-08-02 20:49:16.000000000 +0000 @@ -0,0 +1,129 @@ + + +%version-entities; + +]> + + +Orc Program Syntax +3 +Orc + + + +Orc Program + +Description of the Orc program syntax + + + + +Orc Program + + + An orc program is an UTF-8 file containing the source read by the + Orc-compiler. Each program consists of several blocks. Each block contains a + directives and opcodes. + + + + .init + + Global initialisation for a module. + + + + + .function + +.function <function-name> + + Starts a new function. Takes one arg which is the function name. + + + + + .flags + +.flags (1d|2d) + + Tells wheter arrays are 1 or 2 dimensional. The default is 1d. + + + + + + + .source + +.source <size> <var-name> [<type-name>] + + Input data array parameter for functions. Arguments denote size of the items + in the array (1,2,4,8), name of the variable and optional name of the type. + Only reads are allowed. + + + + + + .dest + +.dest <size> <var-name> [<type-name>] + + Output data array parameter for functions. Arguments denote size of the + items in the array (1,2,4,8), name of the variable and optional name of the + type. This directive can also be used for in/out array parameters. + + + + + + .accumulator + +.accumulator <size> <var-name> [<type-name>] + + Output value parameter for functions. Arguments denote size of the variable + (1,2,4,8), name of the variable and optional name of the type. + + + + + .param + +.param <size> <var-name> [<type-name>] + + Parameter for functions. Arguments denote size of the variable (1,2,4,8), + name of the variable and optional name of the type. + + + This directive has variants named: .longparam, .floatparam and .doubleparam. + + + + + .const + +.const <size> <var-name> + + Constant for functions. Arguments denote size of the constant (1,2,4,8) and + the name. + + + + + .temp + +.temp <size> <var-name> + + Local variable for functions. Arguments denote size of the variable + (1,2,4,8) and then name. + + + + + diff -Nru orc-0.4.17/orc/generate-bytecode.c orc-0.4.18/orc/generate-bytecode.c --- orc-0.4.17/orc/generate-bytecode.c 2013-01-04 20:17:52.000000000 +0000 +++ orc-0.4.18/orc/generate-bytecode.c 2013-08-02 20:49:16.000000000 +0000 @@ -34,6 +34,7 @@ printf("\n"); printf("Application Options:\n"); printf(" -o, --output FILE Write output to FILE\n"); + printf(" --header Write header instead of .c file\n"); printf("\n"); exit (0); @@ -77,7 +78,8 @@ } if (output_file == NULL) { - output_file = "out.c"; + output_file = output_header ? "out.h" : "out.c"; + printf("Writing to file: %s\n", output_file); } output = fopen (output_file, "w"); @@ -122,7 +124,8 @@ fprintf(output, " ORC_BC_ADD_PARAMETER_INT64,\n"); fprintf(output, " ORC_BC_ADD_PARAMETER_DOUBLE,\n"); fprintf(output, " ORC_BC_ADD_TEMPORARY,\n"); - for (i=21;i<32;i++){ + fprintf(output, " ORC_BC_INSTRUCTION_FLAGS,\n"); + for (i=22;i<32;i++){ fprintf(output, " ORC_BC_RESERVED_%d,\n", i); } for(i=0;in_opcodes;i++){ @@ -163,7 +166,8 @@ fprintf(output, " ORC_BC_ADD_PARAMETER_INT64,\n"); fprintf(output, " ORC_BC_ADD_PARAMETER_DOUBLE,\n"); fprintf(output, " ORC_BC_ADD_TEMPORARY,\n"); - for (i=21;i<32;i++){ + fprintf(output, " ORC_BC_INSTRUCTION_FLAGS,\n"); + for (i=22;i<32;i++){ fprintf(output, " ORC_BC_RESERVED_%d,\n", i); } diff -Nru orc-0.4.17/orc/generate-emulation.c orc-0.4.18/orc/generate-emulation.c --- orc-0.4.17/orc/generate-emulation.c 2013-01-04 20:17:52.000000000 +0000 +++ orc-0.4.18/orc/generate-emulation.c 2013-08-02 20:49:16.000000000 +0000 @@ -35,6 +35,7 @@ printf("\n"); printf("Application Options:\n"); printf(" -o, --output FILE Write output to FILE\n"); + printf(" --header Write header instead of .c file\n"); printf("\n"); exit (0); @@ -78,7 +79,8 @@ } if (output_file == NULL) { - output_file = "out.c"; + output_file = output_header ? "out.h" : "out.c"; + printf("Writing to file: %s\n", output_file); } output = fopen (output_file, "w"); diff -Nru orc-0.4.17/orc/orcarm.c orc-0.4.18/orc/orcarm.c --- orc-0.4.17/orc/orcarm.c 2013-02-20 03:37:07.000000000 +0000 +++ orc-0.4.18/orc/orcarm.c 2013-08-02 20:49:16.000000000 +0000 @@ -14,6 +14,12 @@ #include #include +#ifdef HAVE_ARM +#if defined(__APPLE__) +#include +#endif +#endif + /** * SECTION:orcarm * @title: ARM @@ -724,8 +730,12 @@ orc_arm_flush_cache (OrcCode *code) { #ifdef HAVE_ARM +#ifdef __APPLE__ + sys_icache_invalidate(code->code, code->code_size); +#else __clear_cache (code->code, code->code + code->code_size); #endif +#endif } void diff -Nru orc-0.4.17/orc/orcbytecode.c orc-0.4.18/orc/orcbytecode.c --- orc-0.4.17/orc/orcbytecode.c 2013-02-20 01:39:37.000000000 +0000 +++ orc-0.4.18/orc/orcbytecode.c 2013-08-24 16:58:02.000000000 +0000 @@ -349,9 +349,9 @@ { orc_uint32 value; value = orc_bytecode_parse_get_byte (parse); - value |= orc_bytecode_parse_get_byte (parse) << 8; - value |= orc_bytecode_parse_get_byte (parse) << 16; - value |= orc_bytecode_parse_get_byte (parse) << 24; + value |= ((orc_uint32)orc_bytecode_parse_get_byte (parse)) << 8; + value |= ((orc_uint32)orc_bytecode_parse_get_byte (parse)) << 16; + value |= ((orc_uint32)orc_bytecode_parse_get_byte (parse)) << 24; return value; } @@ -359,14 +359,16 @@ orc_bytecode_parse_get_uint64 (OrcBytecodeParse *parse) { orc_uint64 value; - value = orc_bytecode_parse_get_byte (parse); - value |= orc_bytecode_parse_get_byte (parse) << 8; - value |= orc_bytecode_parse_get_byte (parse) << 16; - value |= orc_bytecode_parse_get_byte (parse) << 24; - value |= (orc_uint64)orc_bytecode_parse_get_byte (parse) << 32; - value |= (orc_uint64)orc_bytecode_parse_get_byte (parse) << 40; - value |= (orc_uint64)orc_bytecode_parse_get_byte (parse) << 48; - value |= (orc_uint64)orc_bytecode_parse_get_byte (parse) << 56; + + value = ((orc_uint64)orc_bytecode_parse_get_byte (parse)); + value |= ((orc_uint64)orc_bytecode_parse_get_byte (parse)) << 8; + value |= ((orc_uint64)orc_bytecode_parse_get_byte (parse)) << 16; + value |= ((orc_uint64)orc_bytecode_parse_get_byte (parse)) << 24; + value |= ((orc_uint64)orc_bytecode_parse_get_byte (parse)) << 32; + value |= ((orc_uint64)orc_bytecode_parse_get_byte (parse)) << 40; + value |= ((orc_uint64)orc_bytecode_parse_get_byte (parse)) << 48; + value |= ((orc_uint64)orc_bytecode_parse_get_byte (parse)) << 56; + return value; } diff -Nru orc-0.4.17/orc/orccompiler.c orc-0.4.18/orc/orccompiler.c --- orc-0.4.17/orc/orccompiler.c 2013-02-20 01:39:37.000000000 +0000 +++ orc-0.4.18/orc/orccompiler.c 2013-03-10 19:15:40.000000000 +0000 @@ -580,6 +580,10 @@ cinsn->opcode = get_loadp_opcode_for_size (opcode->src_size[i]); cinsn->dest_args[0] = orc_compiler_new_temporary (compiler, opcode->src_size[i] * multiplier); + if (var->vartype == ORC_VAR_TYPE_CONST) { + compiler->vars[cinsn->dest_args[0]].flags |= + ORC_VAR_FLAG_VOLATILE_WORKAROUND; + } cinsn->src_args[0] = insn.src_args[i]; insn.src_args[i] = cinsn->dest_args[0]; diff -Nru orc-0.4.17/orc/orcparse.c orc-0.4.18/orc/orcparse.c --- orc-0.4.17/orc/orcparse.c 2013-02-20 01:39:37.000000000 +0000 +++ orc-0.4.18/orc/orcparse.c 2013-08-02 20:49:16.000000000 +0000 @@ -168,7 +168,7 @@ } } else if (strcmp (token[i], "min") == 0) { if (i == n_tokens - 1) { - orc_parse_log (parser, "error: line %d: .n mult requires multiple value\n", + orc_parse_log (parser, "error: line %d: .n min requires multiple value\n", parser->line_number); } else { orc_program_set_n_minimum (parser->program, @@ -177,7 +177,7 @@ } } else if (strcmp (token[i], "max") == 0) { if (i == n_tokens - 1) { - orc_parse_log (parser, "error: line %d: .n mult requires multiple value\n", + orc_parse_log (parser, "error: line %d: .n max requires multiple value\n", parser->line_number); } else { orc_program_set_n_maximum (parser->program, diff -Nru orc-0.4.17/orc/orcprogram-c.c orc-0.4.18/orc/orcprogram-c.c --- orc-0.4.17/orc/orcprogram-c.c 2013-02-20 01:39:37.000000000 +0000 +++ orc-0.4.18/orc/orcprogram-c.c 2013-08-02 20:49:16.000000000 +0000 @@ -243,7 +243,18 @@ break; case ORC_VAR_TYPE_TEMP: if (!(var->last_use == -1 && var->first_use == 0)) { - ORC_ASM_CODE(compiler," %s var%d;\n", c_get_type_name(var->size), i); + if (var->flags & ORC_VAR_FLAG_VOLATILE_WORKAROUND) { + ORC_ASM_CODE(compiler,"#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) \n"); + ORC_ASM_CODE(compiler," volatile %s var%d;\n", + c_get_type_name(var->size), i); + ORC_ASM_CODE(compiler,"#else\n"); + ORC_ASM_CODE(compiler," %s var%d;\n", + c_get_type_name(var->size), i); + ORC_ASM_CODE(compiler,"#endif\n"); + } else { + ORC_ASM_CODE(compiler," %s var%d;\n", + c_get_type_name(var->size), i); + } } break; case ORC_VAR_TYPE_SRC: @@ -1231,7 +1242,7 @@ c_get_name_float (dest, p, insn, insn->dest_args[0]); c_get_name_int (src1, p, insn, insn->src_args[0]); - ORC_ASM_CODE(p," %s = %s;\n", dest, src1); + ORC_ASM_CODE(p," %s = %s;\n", dest, src1); } static void @@ -1242,7 +1253,7 @@ c_get_name_float (dest, p, insn, insn->dest_args[0]); c_get_name_int (src1, p, insn, insn->src_args[0]); - ORC_ASM_CODE(p," %s = %s;\n", dest, src1); + ORC_ASM_CODE(p," %s = %s;\n", dest, src1); } static void diff -Nru orc-0.4.17/orc/orcprogram-mmx.c orc-0.4.18/orc/orcprogram-mmx.c --- orc-0.4.17/orc/orcprogram-mmx.c 2013-01-04 20:17:52.000000000 +0000 +++ orc-0.4.18/orc/orcprogram-mmx.c 2013-08-02 20:49:16.000000000 +0000 @@ -279,10 +279,10 @@ for(i=0;ivars + i; - if (compiler->vars[i].name == NULL) continue; - switch (compiler->vars[i].vartype) { + if (var->name == NULL) continue; + switch (var->vartype) { case ORC_VAR_TYPE_ACCUMULATOR: - src = compiler->vars[i].alloc; + src = var->alloc; tmp = orc_compiler_get_temp_reg (compiler); #ifndef MMX @@ -291,7 +291,7 @@ orc_mmx_emit_pshufw (compiler, ORC_MMX_SHUF(3,2,3,2), src, tmp); #endif - if (compiler->vars[i].size == 2) { + if (var->size == 2) { orc_mmx_emit_paddw (compiler, tmp, src); } else { orc_mmx_emit_paddd (compiler, tmp, src); @@ -300,14 +300,14 @@ #ifndef MMX orc_mmx_emit_pshufd (compiler, ORC_MMX_SHUF(1,1,1,1), src, tmp); - if (compiler->vars[i].size == 2) { + if (var->size == 2) { orc_mmx_emit_paddw (compiler, tmp, src); } else { orc_mmx_emit_paddd (compiler, tmp, src); } #endif - if (compiler->vars[i].size == 2) { + if (var->size == 2) { #ifndef MMX orc_mmx_emit_pshuflw (compiler, ORC_MMX_SHUF(1,1,1,1), src, tmp); #else @@ -317,7 +317,7 @@ orc_mmx_emit_paddw (compiler, tmp, src); } - if (compiler->vars[i].size == 2) { + if (var->size == 2) { orc_mmx_emit_movd_store_register (compiler, src, compiler->gp_tmpreg); orc_x86_emit_and_imm_reg (compiler, 4, 0xffff, compiler->gp_tmpreg); orc_x86_emit_mov_reg_memoffset (compiler, 4, compiler->gp_tmpreg, diff -Nru orc-0.4.17/orc/orcprogram-sse.c orc-0.4.18/orc/orcprogram-sse.c --- orc-0.4.17/orc/orcprogram-sse.c 2013-01-04 20:17:52.000000000 +0000 +++ orc-0.4.18/orc/orcprogram-sse.c 2013-08-02 20:49:16.000000000 +0000 @@ -279,10 +279,10 @@ for(i=0;ivars + i; - if (compiler->vars[i].name == NULL) continue; - switch (compiler->vars[i].vartype) { + if (var->name == NULL) continue; + switch (var->vartype) { case ORC_VAR_TYPE_ACCUMULATOR: - src = compiler->vars[i].alloc; + src = var->alloc; tmp = orc_compiler_get_temp_reg (compiler); #ifndef MMX @@ -291,7 +291,7 @@ orc_mmx_emit_pshufw (compiler, ORC_MMX_SHUF(3,2,3,2), src, tmp); #endif - if (compiler->vars[i].size == 2) { + if (var->size == 2) { orc_sse_emit_paddw (compiler, tmp, src); } else { orc_sse_emit_paddd (compiler, tmp, src); @@ -300,14 +300,14 @@ #ifndef MMX orc_sse_emit_pshufd (compiler, ORC_SSE_SHUF(1,1,1,1), src, tmp); - if (compiler->vars[i].size == 2) { + if (var->size == 2) { orc_sse_emit_paddw (compiler, tmp, src); } else { orc_sse_emit_paddd (compiler, tmp, src); } #endif - if (compiler->vars[i].size == 2) { + if (var->size == 2) { #ifndef MMX orc_sse_emit_pshuflw (compiler, ORC_SSE_SHUF(1,1,1,1), src, tmp); #else @@ -317,7 +317,7 @@ orc_sse_emit_paddw (compiler, tmp, src); } - if (compiler->vars[i].size == 2) { + if (var->size == 2) { orc_sse_emit_movd_store_register (compiler, src, compiler->gp_tmpreg); orc_x86_emit_and_imm_reg (compiler, 4, 0xffff, compiler->gp_tmpreg); orc_x86_emit_mov_reg_memoffset (compiler, 4, compiler->gp_tmpreg, diff -Nru orc-0.4.17/orc/orcrules-mips.c orc-0.4.18/orc/orcrules-mips.c --- orc-0.4.17/orc/orcrules-mips.c 2013-02-20 01:39:37.000000000 +0000 +++ orc-0.4.18/orc/orcrules-mips.c 2013-04-01 18:31:32.000000000 +0000 @@ -467,6 +467,7 @@ src->update_type = 1; } +#if 0 void mips_rule_loadupdb (OrcCompiler *compiler, void *user, OrcInstruction *insn) { @@ -513,6 +514,7 @@ } src->update_type = 1; } +#endif void mips_rule_loadp (OrcCompiler *compiler, void *user, OrcInstruction *insn) @@ -721,7 +723,7 @@ orc_rule_register (rule_set, "addssw", mips_rule_addssw, NULL); orc_rule_register (rule_set, "subssw", mips_rule_subssw, NULL); orc_rule_register (rule_set, "loadupib", mips_rule_loadupib, NULL); - orc_rule_register (rule_set, "loadupdb", mips_rule_loadupdb, NULL); + /* orc_rule_register (rule_set, "loadupdb", mips_rule_loadupdb, NULL); */ orc_rule_register (rule_set, "shrsw", mips_rule_shrsw, NULL); orc_rule_register (rule_set, "shruw", mips_rule_shruw, NULL); orc_rule_register (rule_set, "swapl", mips_rule_swapl, NULL); diff -Nru orc-0.4.17/orc/orcvariable.h orc-0.4.18/orc/orcvariable.h --- orc-0.4.17/orc/orcvariable.h 2013-02-20 01:39:37.000000000 +0000 +++ orc-0.4.18/orc/orcvariable.h 2013-03-10 19:15:40.000000000 +0000 @@ -13,6 +13,8 @@ ORC_BEGIN_DECLS +#define ORC_VAR_FLAG_VOLATILE_WORKAROUND (1<<0) + typedef struct _OrcVariable OrcVariable; typedef enum { @@ -67,6 +69,7 @@ int load_dest; int update_type; int need_offset_reg; + unsigned int flags; }; ORC_END_DECLS diff -Nru orc-0.4.17/orc-test/orcarray.c orc-0.4.18/orc-test/orcarray.c --- orc-0.4.17/orc-test/orcarray.c 2013-02-20 04:01:51.000000000 +0000 +++ orc-0.4.18/orc-test/orcarray.c 2013-08-02 20:49:16.000000000 +0000 @@ -69,7 +69,7 @@ ar->alloc_data = data; ar->aligned_data = data; #else -#ifdef HAVE_POSIX_MEMALIGNx +#ifdef HAVE_POSIX_MEMALIGN ret = posix_memalign (&data, ALIGNMENT, ar->alloc_len); ar->alloc_data = data; ar->aligned_data = data; diff -Nru orc-0.4.17/orc-uninstalled.pc.in orc-0.4.18/orc-uninstalled.pc.in --- orc-0.4.17/orc-uninstalled.pc.in 2011-04-12 16:22:03.000000000 +0000 +++ orc-0.4.18/orc-uninstalled.pc.in 2013-04-01 18:31:32.000000000 +0000 @@ -6,7 +6,7 @@ Name: orc-@ORC_MAJORMINOR@ uninstalled Description: Library of Optimized Inner Loops Runtime Compiler Version: @VERSION@ -Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ @LIBM@ @LIBRT@ +Libs: @abs_top_builddir@/orc/liborc-@ORC_MAJORMINOR@.la @LIBM@ @LIBRT@ Cflags: -I${includedir} orcc=${pcfiledir}/tools/orcc@EXEEXT@ diff -Nru orc-0.4.17/testsuite/exec_opcodes_sys.c orc-0.4.18/testsuite/exec_opcodes_sys.c --- orc-0.4.17/testsuite/exec_opcodes_sys.c 2012-12-04 00:58:31.000000000 +0000 +++ orc-0.4.18/testsuite/exec_opcodes_sys.c 2013-08-02 20:49:16.000000000 +0000 @@ -117,8 +117,7 @@ orc_program_add_source (p, opcode->src_size[1], "s2"); } - if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || - (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { + if (opcode->flags & ORC_STATIC_OPCODE_FLOAT) { flags = ORC_TEST_FLAGS_FLOAT; } @@ -174,8 +173,7 @@ orc_program_add_constant (p, opcode->src_size[2], 1, "c2"); } - if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || - (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { + if (opcode->flags & ORC_STATIC_OPCODE_FLOAT) { flags = ORC_TEST_FLAGS_FLOAT; } @@ -228,8 +226,7 @@ orc_program_add_parameter (p, opcode->src_size[2], "p2"); } - if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || - (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { + if (opcode->flags & ORC_STATIC_OPCODE_FLOAT) { flags = ORC_TEST_FLAGS_FLOAT; } @@ -272,8 +269,7 @@ orc_program_add_source (p, opcode->src_size[0], "s2"); } - if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || - (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { + if (opcode->flags & ORC_STATIC_OPCODE_FLOAT) { flags = ORC_TEST_FLAGS_FLOAT; } @@ -317,8 +313,7 @@ orc_program_add_source (p, opcode->src_size[1], "s2"); } - if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || - (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { + if (opcode->flags & ORC_STATIC_OPCODE_FLOAT) { flags = ORC_TEST_FLAGS_FLOAT; } @@ -367,8 +362,7 @@ orc_program_add_source (p, opcode->src_size[1], "s2"); } - if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || - (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { + if (opcode->flags & ORC_STATIC_OPCODE_FLOAT) { flags = ORC_TEST_FLAGS_FLOAT; } @@ -417,8 +411,7 @@ orc_program_add_source (p, opcode->src_size[1], "s2"); } - if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || - (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { + if (opcode->flags & ORC_STATIC_OPCODE_FLOAT) { flags = ORC_TEST_FLAGS_FLOAT; } diff -Nru orc-0.4.17/testsuite/generate_xml_table.c orc-0.4.18/testsuite/generate_xml_table.c --- orc-0.4.17/testsuite/generate_xml_table.c 2012-12-04 00:58:31.000000000 +0000 +++ orc-0.4.18/testsuite/generate_xml_table.c 2013-08-02 20:49:16.000000000 +0000 @@ -21,32 +21,39 @@ OrcOpcodeSet *opcode_set; OrcTarget *targets[10]; unsigned int target_flags[10]; - int n_targets; + int n_targets = 0; orc_init(); orc_test_init(); - targets[0] = orc_target_get_by_name("sse"); - target_flags[0] = orc_target_get_default_flags(targets[0]); - - targets[1] = orc_target_get_by_name("mmx"); - target_flags[1] = orc_target_get_default_flags(targets[1]); - - targets[2] = orc_target_get_by_name("altivec"); - target_flags[2] = orc_target_get_default_flags(targets[2]); - - targets[3] = orc_target_get_by_name("arm"); - target_flags[3] = orc_target_get_default_flags(targets[3]); - - targets[4] = orc_target_get_by_name("neon"); - target_flags[4] = orc_target_get_default_flags(targets[4]); - - targets[5] = orc_target_get_by_name("c64x-c"); - target_flags[5] = orc_target_get_default_flags(targets[5]); - - n_targets=6; + targets[n_targets] = orc_target_get_by_name("sse"); + target_flags[n_targets] = orc_target_get_default_flags(targets[n_targets]); + n_targets++; + + targets[n_targets] = orc_target_get_by_name("mmx"); + target_flags[n_targets] = orc_target_get_default_flags(targets[n_targets]); + n_targets++; + + targets[n_targets] = orc_target_get_by_name("altivec"); + target_flags[n_targets] = orc_target_get_default_flags(targets[n_targets]); + n_targets++; + + /* disabled due to bad coverage + targets[n_targets] = orc_target_get_by_name("arm"); + target_flags[n_targets] = orc_target_get_default_flags(targets[n_targets]); + n_targets++; + */ + + targets[n_targets] = orc_target_get_by_name("neon"); + target_flags[n_targets] = orc_target_get_default_flags(targets[n_targets]); + n_targets++; + + targets[n_targets] = orc_target_get_by_name("c64x-c"); + target_flags[n_targets] = orc_target_get_default_flags(targets[n_targets]); + n_targets++; printf( +"\n" "\n" "Table of Opcode Rule Coverage\n" "\n" diff -Nru orc-0.4.17/testsuite/generate_xml_table2.c orc-0.4.18/testsuite/generate_xml_table2.c --- orc-0.4.17/testsuite/generate_xml_table2.c 2012-12-04 00:58:31.000000000 +0000 +++ orc-0.4.18/testsuite/generate_xml_table2.c 2013-08-02 20:49:16.000000000 +0000 @@ -24,6 +24,7 @@ orc_test_init(); printf( +"\n" "
\n" "Table of Opcodes\n" "\n" @@ -154,6 +155,19 @@ { "subssl", "clamp(a - b)", "subtract with signed saturate" }, { "subusl", "clamp(a - b)", "subtract with unsigned saturate" }, { "xorl", "a ^ b", "bitwise XOR" }, + + { "addq", "a + b", "add" }, + { "andq", "a & b", "bitwise AND" }, + { "andnq", "a & (~b)", "bitwise AND NOT" }, + { "cmpeqq", "(a == b) ? (~0) : 0", "compare equal" }, + { "cmpgtsq", "(a > b) ? (~0) : 0", "compare greater than" }, + { "copyq", "a", "copy" }, + { "orq", "a | b", "bitwise or" }, + { "shlq", "a << b", "shift left" }, + { "shrsq", "a >> b", "signed shift right" }, + { "shruq", "a >> b", "unsigned shift right" }, + { "subq", "a - b", "subtract" }, + { "xorq", "a ^ b", "bitwise XOR" }, { "convsbw", "a", "convert signed" }, { "convubw", "a", "convert unsigned" }, @@ -173,34 +187,58 @@ { "mulubw", "a * b", "multiply unsigned" }, { "mulswl", "a * b", "multiply signed" }, { "muluwl", "a * b", "multiply unsigned" }, + { "mulslq", "a * b", "multiply signed" }, + { "mululq", "a * b", "multiply unsigned" }, + { "mergelq", "special", "merge halves" }, { "mergewl", "special", "merge halves" }, { "mergebw", "special", "merge halves" }, { "select0wb", "special", "select first half" }, { "select1wb", "special", "select second half" }, { "select0lw", "special", "select first half" }, { "select1lw", "special", "select second half" }, - { "swapw", "special", "endianness swap" }, - { "swapl", "special", "endianness swap" }, + { "select0ql", "special", "select first half" }, + { "select1ql", "special", "select second half" }, + { "swapq", "special", "endianness byte swap" }, + { "swapw", "special", "endianness byte swap" }, + { "swapl", "special", "endianness byte swap" }, + { "swapwl", "special", "endianness word swap" }, + { "swaplq", "special", "endianness long word swap" }, { "accw", "+= a", "accumulate" }, { "accl", "+= a", "accumulate" }, { "accsadubl", "+= abs(a - b)", "accumulate absolute difference" }, + { "splitql" , "special", "split first/second long words" }, { "splitlw" , "special", "split first/second words" }, { "splitwb" , "special", "split first/second bytes" }, + { "addf", "a + b", "add" }, + { "addd", "a + b", "add" }, { "subf", "a - b", "subtract" }, + { "subd", "a - b", "subtract" }, { "mulf", "a * b", "multiply" }, + { "muld", "a * b", "multiply" }, { "divf", "a / b", "divide" }, + { "divd", "a / b", "divide" }, { "sqrtf", "sqrt(a)", "square root" }, + { "sqrtd", "sqrt(a)", "square root" }, { "maxf", "max(a,b)", "maximum" }, + { "maxd", "max(a,b)", "maximum" }, { "minf", "min(a,b)", "minimum" }, + { "mind", "min(a,b)", "minimum" }, { "cmpeqf", "(a == b) ? (~0) : 0", "compare equal" }, + { "cmpeqd", "(a == b) ? (~0) : 0", "compare equal" }, { "cmpltf", "(a == b) ? (~0) : 0", "compare less than" }, + { "cmpltd", "(a == b) ? (~0) : 0", "compare less than" }, { "cmplef", "(a == b) ? (~0) : 0", "compare less than or equal" }, + { "cmpled", "(a == b) ? (~0) : 0", "compare less than or equal" }, { "convfl", "a", "convert float point to integer" }, { "convlf", "a", "convert integer to floating point" }, - + { "convdl", "a", "convert double point to integer" }, + { "convld", "a", "convert integer to double point" }, + { "convfd", "a", "convert float to double" }, + { "convdf", "a", "convert double to float" }, + { "loadb", "array[i]", "load from memory" }, { "loadw", "array[i]", "load from memory" }, { "loadl", "array[i]", "load from memory" }, diff -Nru orc-0.4.17/testsuite/orcc/orc_test.c orc-0.4.18/testsuite/orcc/orc_test.c --- orc-0.4.17/testsuite/orcc/orc_test.c 2013-02-20 05:39:47.000000000 +0000 +++ orc-0.4.18/testsuite/orcc/orc_test.c 2013-08-24 17:18:39.000000000 +0000 @@ -133,7 +133,11 @@ const orc_union16 * ORC_RESTRICT ptr6; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -180,7 +184,11 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -227,7 +235,11 @@ const orc_union16 * ORC_RESTRICT ptr6; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -274,7 +286,11 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -470,7 +486,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -935,7 +955,11 @@ const orc_union16 * ORC_RESTRICT ptr8; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -1010,7 +1034,11 @@ const orc_union16 * ORC_RESTRICT ptr7; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -1085,7 +1113,11 @@ const orc_union16 * ORC_RESTRICT ptr8; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -1160,7 +1192,11 @@ const orc_union16 * ORC_RESTRICT ptr7; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -1383,7 +1419,11 @@ orc_int8 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_int8 var35; orc_union16 var36; @@ -1415,7 +1455,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_int8 * ORC_RESTRICT ptr4; orc_int8 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -1715,7 +1759,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_int8 var36; orc_union16 var37; @@ -1761,7 +1809,11 @@ orc_union16 * ORC_RESTRICT ptr0; orc_union16 * ORC_RESTRICT ptr1; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -1807,7 +1859,11 @@ int m = ex->params[ORC_VAR_A1]; orc_union16 * ORC_RESTRICT ptr0; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -1839,7 +1895,11 @@ int n = ex->n; orc_union16 * ORC_RESTRICT ptr0; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -2189,9 +2249,17 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union32 var38; orc_union16 var39; orc_union16 var40; @@ -2338,7 +2406,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union32 var39; orc_union16 var40; @@ -2403,7 +2475,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union32 var39; orc_union16 var40; @@ -2462,7 +2538,11 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; orc_union16 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -2538,7 +2618,11 @@ orc_union16 var34; orc_union16 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -2586,7 +2670,11 @@ orc_union16 var34; orc_union16 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -2634,7 +2722,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -2671,7 +2763,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -2715,7 +2811,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -2764,7 +2864,11 @@ orc_union16 * ORC_RESTRICT ptr1; orc_union16 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -2813,10 +2917,22 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union32 var39; orc_union16 var40; orc_union16 var41; @@ -2876,7 +2992,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union32 var37; orc_union16 var38; @@ -2955,7 +3075,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -3019,7 +3143,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -3858,11 +3986,23 @@ const orc_int8 * ORC_RESTRICT ptr7; orc_int8 var35; orc_int8 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_int8 var38; orc_int8 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var40; +#else orc_union16 var40; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var41; +#else orc_union16 var41; +#endif orc_int8 var42; orc_union16 var43; orc_union16 var44; @@ -3939,9 +4079,21 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var38; orc_union16 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var40; +#else orc_union16 var40; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var41; +#else orc_union16 var41; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -4044,8 +4196,16 @@ const orc_union16 * ORC_RESTRICT ptr4; orc_union32 var12 = { 0 }; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -4085,9 +4245,21 @@ const orc_union16 * ORC_RESTRICT ptr4; orc_union32 var12 = { 0 }; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -4345,7 +4517,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -4441,7 +4617,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -4537,7 +4717,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -4633,7 +4817,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -4729,7 +4917,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -4825,7 +5017,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -5332,12 +5528,28 @@ orc_int8 * ORC_RESTRICT ptr0; const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union32 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union32 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var40; +#else orc_union16 var40; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var41; +#else orc_union16 var41; +#endif orc_int8 var42; orc_union16 var43; orc_int8 var44; @@ -6139,7 +6351,11 @@ const orc_union32 * ORC_RESTRICT ptr5; orc_union32 var37; orc_union32 var38; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var39; +#else orc_union64 var39; +#endif orc_union32 var40; orc_union64 var41; orc_union64 var42; @@ -6245,7 +6461,11 @@ int n = ex->n; orc_union32 * ORC_RESTRICT ptr0; const orc_union32 * ORC_RESTRICT ptr4; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var37; +#else orc_union64 var37; +#endif orc_union32 var38; orc_union32 var39; orc_union64 var40; @@ -6470,7 +6690,11 @@ orc_union32 var37; orc_union32 var38; orc_union32 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var40; +#else orc_union64 var40; +#endif orc_union32 var41; orc_union64 var42; orc_union64 var43; @@ -6565,7 +6789,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var37; orc_union32 var38; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var39; +#else orc_union64 var39; +#endif orc_union32 var40; orc_union64 var41; orc_union64 var42; @@ -6639,7 +6867,11 @@ orc_union32 var41; orc_union32 var42; orc_union32 var43; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var44; +#else orc_union64 var44; +#endif orc_union32 var45; orc_union64 var46; orc_union64 var47; @@ -6770,7 +7002,11 @@ orc_union32 var40; orc_union32 var41; orc_union32 var42; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var43; +#else orc_union64 var43; +#endif orc_union32 var44; orc_union64 var45; orc_union64 var46; @@ -6878,9 +7114,17 @@ orc_union32 var40; orc_union32 var41; orc_union32 var42; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var43; +#else orc_union64 var43; +#endif orc_union32 var44; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var45; +#else orc_union64 var45; +#endif orc_union32 var46; orc_union64 var47; orc_union64 var48; @@ -7021,9 +7265,17 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var40; orc_union32 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var42; +#else orc_union64 var42; +#endif orc_union32 var43; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var44; +#else orc_union64 var44; +#endif orc_union32 var45; orc_union64 var46; orc_union64 var47; @@ -7240,7 +7492,11 @@ const orc_union32 * ORC_RESTRICT ptr5; orc_union32 var40; orc_union32 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var42; +#else orc_union64 var42; +#endif orc_union32 var43; orc_union64 var44; orc_union64 var45; @@ -7356,7 +7612,11 @@ orc_union32 * ORC_RESTRICT ptr0; const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var40; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var41; +#else orc_union64 var41; +#endif orc_union32 var42; orc_union64 var43; orc_union64 var44; @@ -7447,7 +7707,11 @@ const orc_int8 * ORC_RESTRICT ptr5; orc_union32 var38; orc_int8 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var40; +#else orc_union64 var40; +#endif orc_union32 var41; orc_union64 var42; orc_union32 var43; @@ -7555,7 +7819,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var40; orc_union32 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var42; +#else orc_union64 var42; +#endif orc_union32 var43; orc_union64 var44; orc_union64 var45; @@ -7720,7 +7988,11 @@ int i; int n = ex->n; orc_union32 * ORC_RESTRICT ptr0; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union32 var32; +#else orc_union32 var32; +#endif orc_union32 var33; ptr0 = (orc_union32 *)ex->arrays[0]; @@ -7744,7 +8016,11 @@ int i; int n = ex->n; orc_union32 * ORC_RESTRICT ptr0; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union32 var32; +#else orc_union32 var32; +#endif orc_union32 var33; ptr0 = (orc_union32 *)ex->arrays[0]; @@ -7770,7 +8046,11 @@ orc_union32 * ORC_RESTRICT ptr0; const orc_union64 * ORC_RESTRICT ptr4; orc_union64 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var35; +#else orc_union64 var35; +#endif orc_union32 var36; orc_union64 var37; orc_union64 var38; @@ -7857,7 +8137,11 @@ int i; int n = ex->n; orc_union64 * ORC_RESTRICT ptr0; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var32; +#else orc_union64 var32; +#endif orc_union64 var33; ptr0 = (orc_union64 *)ex->arrays[0]; @@ -7907,7 +8191,11 @@ orc_union32 * ORC_RESTRICT ptr0; orc_union32 var37; orc_union32 var38; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var39; +#else orc_union64 var39; +#endif orc_union32 var40; orc_union64 var41; orc_union64 var42; diff -Nru orc-0.4.17/testsuite/orcc/testorc.c orc-0.4.18/testsuite/orcc/testorc.c --- orc-0.4.17/testsuite/orcc/testorc.c 2013-02-20 05:39:47.000000000 +0000 +++ orc-0.4.18/testsuite/orcc/testorc.c 2013-08-24 17:18:39.000000000 +0000 @@ -293,7 +293,11 @@ const orc_union16 * ORC_RESTRICT ptr6; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -341,7 +345,11 @@ const orc_union16 * ORC_RESTRICT ptr6; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -449,7 +457,11 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -495,7 +507,11 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -601,7 +617,11 @@ const orc_union16 * ORC_RESTRICT ptr6; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -649,7 +669,11 @@ const orc_union16 * ORC_RESTRICT ptr6; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -757,7 +781,11 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -803,7 +831,11 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union16 var37; orc_union16 var38; @@ -1434,7 +1466,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -1466,7 +1502,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -3048,7 +3088,11 @@ const orc_union16 * ORC_RESTRICT ptr8; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -3124,7 +3168,11 @@ const orc_union16 * ORC_RESTRICT ptr8; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -3278,7 +3326,11 @@ const orc_union16 * ORC_RESTRICT ptr7; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -3352,7 +3404,11 @@ const orc_union16 * ORC_RESTRICT ptr7; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -3504,7 +3560,11 @@ const orc_union16 * ORC_RESTRICT ptr8; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -3580,7 +3640,11 @@ const orc_union16 * ORC_RESTRICT ptr8; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -3734,7 +3798,11 @@ const orc_union16 * ORC_RESTRICT ptr7; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -3808,7 +3876,11 @@ const orc_union16 * ORC_RESTRICT ptr7; orc_union16 var36; orc_union16 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union16 var39; orc_union16 var40; orc_union32 var41; @@ -4522,7 +4594,11 @@ orc_int8 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_int8 var35; orc_union16 var36; @@ -4554,7 +4630,11 @@ orc_int8 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_int8 var35; orc_union16 var36; @@ -4640,7 +4720,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_int8 * ORC_RESTRICT ptr4; orc_int8 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -4672,7 +4756,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_int8 * ORC_RESTRICT ptr4; orc_int8 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -5760,7 +5848,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_int8 var36; orc_union16 var37; @@ -5807,7 +5899,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_int8 var36; orc_union16 var37; @@ -5917,7 +6013,11 @@ orc_union16 * ORC_RESTRICT ptr0; orc_union16 * ORC_RESTRICT ptr1; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -5964,7 +6064,11 @@ orc_union16 * ORC_RESTRICT ptr0; orc_union16 * ORC_RESTRICT ptr1; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -6071,7 +6175,11 @@ int j; orc_union16 * ORC_RESTRICT ptr0; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -6105,7 +6213,11 @@ int m = ex->params[ORC_VAR_A1]; orc_union16 * ORC_RESTRICT ptr0; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -6193,7 +6305,11 @@ int i; orc_union16 * ORC_RESTRICT ptr0; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -6223,7 +6339,11 @@ int n = ex->n; orc_union16 * ORC_RESTRICT ptr0; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; @@ -7365,9 +7485,17 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union32 var38; orc_union16 var39; orc_union16 var40; @@ -7419,9 +7547,17 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union32 var38; orc_union16 var39; orc_union16 var40; @@ -7840,7 +7976,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union32 var39; orc_union16 var40; @@ -7905,7 +8045,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union32 var39; orc_union16 var40; @@ -8039,7 +8183,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union32 var39; orc_union16 var40; @@ -8098,7 +8246,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union32 var39; orc_union16 var40; @@ -8221,7 +8373,11 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; orc_union16 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -8264,7 +8420,11 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; orc_union16 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -8482,7 +8642,11 @@ orc_union16 var34; orc_union16 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -8532,7 +8696,11 @@ orc_union16 var34; orc_union16 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -8643,7 +8811,11 @@ orc_union16 var34; orc_union16 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -8692,7 +8864,11 @@ orc_union16 var34; orc_union16 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -8799,7 +8975,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -8836,7 +9016,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -8929,7 +9113,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -8972,7 +9160,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -9076,7 +9268,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -9126,7 +9322,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -9239,7 +9439,11 @@ orc_union16 * ORC_RESTRICT ptr1; orc_union16 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -9288,7 +9492,11 @@ orc_union16 * ORC_RESTRICT ptr1; orc_union16 var35; orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -9397,10 +9605,22 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union32 var39; orc_union16 var40; orc_union16 var41; @@ -9460,10 +9680,22 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union32 var39; orc_union16 var40; orc_union16 var41; @@ -9587,7 +9819,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union32 var37; orc_union16 var38; @@ -9638,7 +9874,11 @@ const orc_union16 * ORC_RESTRICT ptr4; const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif orc_union16 var36; orc_union32 var37; orc_union16 var38; @@ -9855,7 +10095,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -9890,7 +10134,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -10085,7 +10333,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -10120,7 +10372,11 @@ orc_union16 * ORC_RESTRICT ptr0; const orc_union16 * ORC_RESTRICT ptr4; orc_union16 var33; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var34; +#else orc_union16 var34; +#endif orc_union16 var35; orc_union16 var36; orc_union16 var37; @@ -12818,11 +13074,23 @@ const orc_int8 * ORC_RESTRICT ptr7; orc_int8 var35; orc_int8 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_int8 var38; orc_int8 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var40; +#else orc_union16 var40; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var41; +#else orc_union16 var41; +#endif orc_int8 var42; orc_union16 var43; orc_union16 var44; @@ -12901,11 +13169,23 @@ const orc_int8 * ORC_RESTRICT ptr7; orc_int8 var35; orc_int8 var36; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_int8 var38; orc_int8 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var40; +#else orc_union16 var40; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var41; +#else orc_union16 var41; +#endif orc_int8 var42; orc_union16 var43; orc_union16 var44; @@ -13059,9 +13339,21 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var38; orc_union16 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var40; +#else orc_union16 var40; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var41; +#else orc_union16 var41; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -13166,9 +13458,21 @@ const orc_union16 * ORC_RESTRICT ptr5; orc_union16 var38; orc_union16 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var40; +#else orc_union16 var40; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var41; +#else orc_union16 var41; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -13355,8 +13659,16 @@ const orc_union16 * ORC_RESTRICT ptr4; orc_union32 var12 = { 0 }; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -13396,8 +13708,16 @@ const orc_union16 * ORC_RESTRICT ptr4; orc_union32 var12 = { 0 }; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union16 var37; orc_union16 var38; orc_union16 var39; @@ -13495,9 +13815,21 @@ const orc_union16 * ORC_RESTRICT ptr4; orc_union32 var12 = { 0 }; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -13542,9 +13874,21 @@ const orc_union16 * ORC_RESTRICT ptr4; orc_union32 var12 = { 0 }; orc_union16 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var35; +#else orc_union16 var35; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var37; +#else orc_union16 var37; +#endif orc_union16 var38; orc_union16 var39; orc_union16 var40; @@ -14403,7 +14747,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -14499,7 +14847,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -14686,7 +15038,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -14782,7 +15138,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -14969,7 +15329,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -15065,7 +15429,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -15252,7 +15620,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -15348,7 +15720,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -15535,7 +15911,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -15631,7 +16011,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -15817,7 +16201,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -15916,7 +16304,11 @@ orc_union16 var39; orc_int8 var40; orc_union16 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var42; +#else orc_union16 var42; +#endif orc_int8 var43; orc_union16 var44; orc_union16 var45; @@ -17529,12 +17921,28 @@ orc_int8 * ORC_RESTRICT ptr0; const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union32 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union32 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var40; +#else orc_union16 var40; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var41; +#else orc_union16 var41; +#endif orc_int8 var42; orc_union16 var43; orc_int8 var44; @@ -17655,12 +18063,28 @@ orc_int8 * ORC_RESTRICT ptr0; const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var35; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var36; +#else orc_union16 var36; +#endif orc_union32 var37; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var38; +#else orc_union16 var38; +#endif orc_union32 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var40; +#else orc_union16 var40; +#endif +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union16 var41; +#else orc_union16 var41; +#endif orc_int8 var42; orc_union16 var43; orc_int8 var44; @@ -20063,7 +20487,11 @@ const orc_union32 * ORC_RESTRICT ptr5; orc_union32 var37; orc_union32 var38; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var39; +#else orc_union64 var39; +#endif orc_union32 var40; orc_union64 var41; orc_union64 var42; @@ -20172,7 +20600,11 @@ const orc_union32 * ORC_RESTRICT ptr5; orc_union32 var37; orc_union32 var38; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var39; +#else orc_union64 var39; +#endif orc_union32 var40; orc_union64 var41; orc_union64 var42; @@ -20354,7 +20786,11 @@ int i; orc_union32 * ORC_RESTRICT ptr0; const orc_union32 * ORC_RESTRICT ptr4; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var37; +#else orc_union64 var37; +#endif orc_union32 var38; orc_union32 var39; orc_union64 var40; @@ -20431,7 +20867,11 @@ int n = ex->n; orc_union32 * ORC_RESTRICT ptr0; const orc_union32 * ORC_RESTRICT ptr4; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var37; +#else orc_union64 var37; +#endif orc_union32 var38; orc_union32 var39; orc_union64 var40; @@ -21000,7 +21440,11 @@ orc_union32 var37; orc_union32 var38; orc_union32 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var40; +#else orc_union64 var40; +#endif orc_union32 var41; orc_union64 var42; orc_union64 var43; @@ -21097,7 +21541,11 @@ orc_union32 var37; orc_union32 var38; orc_union32 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var40; +#else orc_union64 var40; +#endif orc_union32 var41; orc_union64 var42; orc_union64 var43; @@ -21264,7 +21712,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var37; orc_union32 var38; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var39; +#else orc_union64 var39; +#endif orc_union32 var40; orc_union64 var41; orc_union64 var42; @@ -21335,7 +21787,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var37; orc_union32 var38; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var39; +#else orc_union64 var39; +#endif orc_union32 var40; orc_union64 var41; orc_union64 var42; @@ -21474,7 +21930,11 @@ orc_union32 var41; orc_union32 var42; orc_union32 var43; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var44; +#else orc_union64 var44; +#endif orc_union32 var45; orc_union64 var46; orc_union64 var47; @@ -21607,7 +22067,11 @@ orc_union32 var41; orc_union32 var42; orc_union32 var43; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var44; +#else orc_union64 var44; +#endif orc_union32 var45; orc_union64 var46; orc_union64 var47; @@ -21820,7 +22284,11 @@ orc_union32 var40; orc_union32 var41; orc_union32 var42; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var43; +#else orc_union64 var43; +#endif orc_union32 var44; orc_union64 var45; orc_union64 var46; @@ -21927,7 +22395,11 @@ orc_union32 var40; orc_union32 var41; orc_union32 var42; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var43; +#else orc_union64 var43; +#endif orc_union32 var44; orc_union64 var45; orc_union64 var46; @@ -22111,9 +22583,17 @@ orc_union32 var40; orc_union32 var41; orc_union32 var42; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var43; +#else orc_union64 var43; +#endif orc_union32 var44; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var45; +#else orc_union64 var45; +#endif orc_union32 var46; orc_union64 var47; orc_union64 var48; @@ -22256,9 +22736,17 @@ orc_union32 var40; orc_union32 var41; orc_union32 var42; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var43; +#else orc_union64 var43; +#endif orc_union32 var44; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var45; +#else orc_union64 var45; +#endif orc_union32 var46; orc_union64 var47; orc_union64 var48; @@ -22484,9 +22972,17 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var40; orc_union32 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var42; +#else orc_union64 var42; +#endif orc_union32 var43; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var44; +#else orc_union64 var44; +#endif orc_union32 var45; orc_union64 var46; orc_union64 var47; @@ -22603,9 +23099,17 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var40; orc_union32 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var42; +#else orc_union64 var42; +#endif orc_union32 var43; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var44; +#else orc_union64 var44; +#endif orc_union32 var45; orc_union64 var46; orc_union64 var47; @@ -23111,7 +23615,11 @@ const orc_union32 * ORC_RESTRICT ptr5; orc_union32 var40; orc_union32 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var42; +#else orc_union64 var42; +#endif orc_union32 var43; orc_union64 var44; orc_union64 var45; @@ -23229,7 +23737,11 @@ const orc_union32 * ORC_RESTRICT ptr5; orc_union32 var40; orc_union32 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var42; +#else orc_union64 var42; +#endif orc_union32 var43; orc_union64 var44; orc_union64 var45; @@ -23426,7 +23938,11 @@ orc_union32 * ORC_RESTRICT ptr0; const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var40; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var41; +#else orc_union64 var41; +#endif orc_union32 var42; orc_union64 var43; orc_union64 var44; @@ -23515,7 +24031,11 @@ orc_union32 * ORC_RESTRICT ptr0; const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var40; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var41; +#else orc_union64 var41; +#endif orc_union32 var42; orc_union64 var43; orc_union64 var44; @@ -23680,7 +24200,11 @@ const orc_int8 * ORC_RESTRICT ptr5; orc_union32 var38; orc_int8 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var40; +#else orc_union64 var40; +#endif orc_union32 var41; orc_union64 var42; orc_union32 var43; @@ -23789,7 +24313,11 @@ const orc_int8 * ORC_RESTRICT ptr5; orc_union32 var38; orc_int8 var39; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var40; +#else orc_union64 var40; +#endif orc_union32 var41; orc_union64 var42; orc_union32 var43; @@ -23975,7 +24503,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var40; orc_union32 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var42; +#else orc_union64 var42; +#endif orc_union32 var43; orc_union64 var44; orc_union64 var45; @@ -24094,7 +24626,11 @@ const orc_union32 * ORC_RESTRICT ptr4; orc_union32 var40; orc_union32 var41; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var42; +#else orc_union64 var42; +#endif orc_union32 var43; orc_union64 var44; orc_union64 var45; @@ -24498,7 +25034,11 @@ test_float_constant_1 (orc_uint32 * ORC_RESTRICT d1, int n){ int i; orc_union32 * ORC_RESTRICT ptr0; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union32 var32; +#else orc_union32 var32; +#endif orc_union32 var33; ptr0 = (orc_union32 *)d1; @@ -24522,7 +25062,11 @@ int i; int n = ex->n; orc_union32 * ORC_RESTRICT ptr0; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union32 var32; +#else orc_union32 var32; +#endif orc_union32 var33; ptr0 = (orc_union32 *)ex->arrays[0]; @@ -24595,7 +25139,11 @@ test_float_constant_2 (orc_uint32 * ORC_RESTRICT d1, int n){ int i; orc_union32 * ORC_RESTRICT ptr0; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union32 var32; +#else orc_union32 var32; +#endif orc_union32 var33; ptr0 = (orc_union32 *)d1; @@ -24619,7 +25167,11 @@ int i; int n = ex->n; orc_union32 * ORC_RESTRICT ptr0; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union32 var32; +#else orc_union32 var32; +#endif orc_union32 var33; ptr0 = (orc_union32 *)ex->arrays[0]; @@ -24694,7 +25246,11 @@ orc_union32 * ORC_RESTRICT ptr0; const orc_union64 * ORC_RESTRICT ptr4; orc_union64 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var35; +#else orc_union64 var35; +#endif orc_union32 var36; orc_union64 var37; orc_union64 var38; @@ -24759,7 +25315,11 @@ orc_union32 * ORC_RESTRICT ptr0; const orc_union64 * ORC_RESTRICT ptr4; orc_union64 var34; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var35; +#else orc_union64 var35; +#endif orc_union32 var36; orc_union64 var37; orc_union64 var38; @@ -24975,7 +25535,11 @@ const64 (orc_uint64 * ORC_RESTRICT d1, int n){ int i; orc_union64 * ORC_RESTRICT ptr0; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var32; +#else orc_union64 var32; +#endif orc_union64 var33; ptr0 = (orc_union64 *)d1; @@ -24999,7 +25563,11 @@ int i; int n = ex->n; orc_union64 * ORC_RESTRICT ptr0; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var32; +#else orc_union64 var32; +#endif orc_union64 var33; ptr0 = (orc_union64 *)ex->arrays[0]; @@ -25177,7 +25745,11 @@ orc_union32 * ORC_RESTRICT ptr0; orc_union32 var37; orc_union32 var38; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var39; +#else orc_union64 var39; +#endif orc_union32 var40; orc_union64 var41; orc_union64 var42; @@ -25256,7 +25828,11 @@ orc_union32 * ORC_RESTRICT ptr0; orc_union32 var37; orc_union32 var38; +#if defined(__APPLE__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 && defined (__i386__) + volatile orc_union64 var39; +#else orc_union64 var39; +#endif orc_union32 var40; orc_union64 var41; orc_union64 var42; diff -Nru orc-0.4.17/testsuite/perf_opcodes_sys_compare.c orc-0.4.18/testsuite/perf_opcodes_sys_compare.c --- orc-0.4.17/testsuite/perf_opcodes_sys_compare.c 2012-12-04 00:58:31.000000000 +0000 +++ orc-0.4.18/testsuite/perf_opcodes_sys_compare.c 2013-08-02 20:49:16.000000000 +0000 @@ -57,8 +57,7 @@ } } - if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || - (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { + if (opcode->flags & ORC_STATIC_OPCODE_FLOAT) { flags = ORC_TEST_FLAGS_FLOAT; }